summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2008-10-02 14:11:07 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2008-10-02 14:11:07 +0000
commitfe6da68ebe01458d4a6595e3b1a93a2efd44809d (patch)
tree48bbc1c74b4bbaa75824dbaacb2d343513d23cdc /sys
parent4bb7b1f9b1fdd00548ba0fc17325da0c87b7d138 (diff)
Fix PF state key mismatches that occur when callers of icmp6_reflect()
recycle mbufs. Based on an initial diff by henning@, also tested by todd@. ok henning@
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet6/icmp6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 6ef865fe5e5..2f22c8198a0 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.101 2008/09/17 05:43:14 chl Exp $ */
+/* $OpenBSD: icmp6.c,v 1.102 2008/10/02 14:11:06 jsing Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -2113,6 +2113,9 @@ icmp6_reflect(struct mbuf *m, size_t off)
* Note that only echo and node information replies are affected,
* since the length of ICMP6 errors is limited to the minimum MTU.
*/
+#if NPF > 0
+ pf_pkt_addr_changed(m);
+#endif
if (ip6_output(m, NULL, NULL, IPV6_MINMTU, NULL, &outif, NULL) != 0 &&
outif)
icmp6_ifstat_inc(outif, ifs6_out_error);