diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-05-31 07:35:37 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-05-31 07:35:37 +0000 |
| commit | 1bae341b33619352a192a1448ff998efcf81dbd5 (patch) | |
| tree | ac02cdf9b19a1f47af26626226263615a65c2d46 /sys/net/pf_norm.c | |
| parent | 31c30784394c461c7db9c650183dfc76938a8ba1 (diff) | |
Do not call nd6_output() without route entry argument.
ok sthen@, bluhm@
Diffstat (limited to 'sys/net/pf_norm.c')
| -rw-r--r-- | sys/net/pf_norm.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index 227317305c0..232adb0f1af 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.185 2016/05/28 12:04:33 sthen Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.186 2016/05/31 07:35:36 mpi Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -687,6 +687,7 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, { struct mbuf *m = *m0, *t; struct pf_fragment_tag *ftag = (struct pf_fragment_tag *)(mtag + 1); + struct rtentry *rt = NULL; u_int32_t mtu; u_int16_t hdrlen, extoff, maxlen; u_int8_t proto; @@ -742,6 +743,16 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, DPFPRINTF(LOG_NOTICE, "refragment error %d", error); action = PF_DROP; } + + if (ifp != NULL) { + rt = rtalloc(sin6tosa(dst), RT_RESOLVE, + m->m_pkthdr.ph_rtableid); + if (rt == NULL) { + ip6stat.ip6s_noroute++; + error = -1; + } + } + for (t = m; m; m = t) { t = m->m_nextpkt; m->m_nextpkt = NULL; @@ -750,7 +761,7 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, if (ifp == NULL) { ip6_forward(m, 0); } else if ((u_long)m->m_pkthdr.len <= ifp->if_mtu) { - nd6_output(ifp, m, dst, NULL); + nd6_output(ifp, m, dst, rt); } else { icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu); @@ -759,6 +770,7 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, m_freem(m); } } + rtfree(rt); return (action); } |