summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2001-05-11 04:56:16 +0000
committerJason Wright <jason@cvs.openbsd.org>2001-05-11 04:56:16 +0000
commit99c3f1d85432fdcb09c3f988a48f4206c82841e2 (patch)
treeccbc90a56e3c621ebe60264d3d19e99e1f31eb22 /sys
parentcb472b15ea599b33e45e1cbd20d62713d1e00dc0 (diff)
check for 'fastroute' condition (like ip_input) in bridge_filter() and
deal with it.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_bridge.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index b649e1b0dc7..dc2fe6c6511 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.54 2001/03/22 02:00:36 jason Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.55 2001/05/11 04:56:15 jason Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -1937,6 +1937,8 @@ bridge_filter(sc, ifp, eh, m)
/* Finally, we get to filter the packet! */
if (fr_checkp && (*fr_checkp)(ip, hlen, ifp, 0, &m))
return (NULL);
+ if (m == NULL) /* in case of 'fastroute' */
+ return (NULL);
/* Rebuild the IP header */
if (m->m_len < hlen && ((m = m_pullup(m, hlen)) == NULL))