diff options
author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2014-01-07 17:07:47 +0000 |
---|---|---|
committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2014-01-07 17:07:47 +0000 |
commit | e51e51a57642cbf68309e265e3a2ec33dba590d3 (patch) | |
tree | d0390e394678a6cd71700a20de688e00be713aee /sys/netinet | |
parent | 889f42b40ec8aa7c9c40d60e3ca54caea303302e (diff) |
Propagate an rdomain number to the nd6_lookup independently from
the ifp pointer which can be NULL. This prevents a crash reported
by David Hill <dhill at mindcry ! org>. OK bluhm
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/tcp_input.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index d9b274a437e..65f6804d54f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.269 2013/10/20 11:03:01 phessler Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.270 2014/01/07 17:07:45 mikeb Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -148,7 +148,8 @@ struct timeval tcp_ackdrop_ppslim_last; do { \ if (tp && tp->t_inpcb && (tp->t_inpcb->inp_flags & INP_IPV6) && \ tp->t_inpcb->inp_route6.ro_rt) { \ - nd6_nud_hint(tp->t_inpcb->inp_route6.ro_rt, NULL, 0); \ + nd6_nud_hint(tp->t_inpcb->inp_route6.ro_rt, NULL, 0, \ + tp->t_inpcb->inp_rtableid); \ } \ } while (0) #else |