summaryrefslogtreecommitdiffstats
path: root/sys/net/bridge.c
diff options
context:
space:
mode:
authoriedowse <iedowse@FreeBSD.org>2002-12-27 16:27:45 +0000
committeriedowse <iedowse@FreeBSD.org>2002-12-27 16:27:45 +0000
commitc2502c00eaf37c6d304f2c970c5ce899f65215aa (patch)
tree662f3d276459afa6c796cae4328f48eaa1fd5e21 /sys/net/bridge.c
parent9f58b9de0eb415cd6896c839fb68e2ff7f60a5de (diff)
downloadFreeBSD-src-c2502c00eaf37c6d304f2c970c5ce899f65215aa.zip
FreeBSD-src-c2502c00eaf37c6d304f2c970c5ce899f65215aa.tar.gz
Fix a bug introduced by revision 1.59 that would cause an immediate
NULL dereference if a bridged packet was rejected by ipfw.
Diffstat (limited to 'sys/net/bridge.c')
-rw-r--r--sys/net/bridge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index 13c36cd..4915c3b 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -799,11 +799,11 @@ static struct mbuf *
bdg_forward(struct mbuf *m0, struct ifnet *dst)
{
#define EH_RESTORE(_m) do { \
- M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT); \
if ((_m) == NULL) { \
bdg_dropped++; \
return NULL; \
} \
+ M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT); \
if (eh != mtod((_m), struct ether_header *)) \
bcopy(&save_eh, mtod((_m), struct ether_header *), ETHER_HDR_LEN); \
else \
OpenPOWER on IntegriCloud