summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-05-03 12:13:39 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-05-03 12:13:39 +0000
commita2b1df34a139d5602dcfd6ab124e4ae01a4e7fce (patch)
tree4ddd1137d5863bec7edc3ecdd35b2d474860bc57 /sys/net
parent2a199f6e62406a31625e8dc85346926d169ae681 (diff)
Put back a panic() if an incoming packet already has a statekey.
Apparently nobody can hit this condition anymore or people do not report bugs if their kernel do not panic. ok dlg@, sashan@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pf.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index b791f0b0b4a..f5ba067fb39 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.969 2016/04/15 02:54:17 dlg Exp $ */
+/* $OpenBSD: pf.c,v 1.970 2016/05/03 12:13:38 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -6570,13 +6570,10 @@ done:
* deal with IP tunnels.
*/
if (pd.m->m_pkthdr.pf.statekey != NULL) {
- printf("WARNING incoming mbuf already has a statekey:");
#ifdef DDB
m_print(pd.m, printf);
-#else
- printf("%p\n", pd.m);
#endif
- pf_pkt_unlink_state_key(pd.m);
+ panic("incoming mbuf already has a statekey");
}
pd.m->m_pkthdr.pf.statekey =
pf_state_key_ref(s->key[PF_SK_STACK]);