aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Kimdon <david.kimdon@devicescape.com>2005-12-26 20:27:10 -0500
committerDavid S. Miller <davem@davemloft.net>2005-12-26 20:27:10 -0500
commit79cac2a221ce18642550a13bed0f0203514923ea (patch)
treeecc66198fee701916e247c44e6bad0db387535ce /net
parent6f4353d891b5e477528cd0b996e0263fecdf5d5f (diff)
[BR_NETFILTER]: Fix leak if skb traverses > 1 bridge
Call nf_bridge_put() before allocating a new nf_bridge structure and potentially overwriting the pointer to a previously allocated one. This fixes a memory leak which can occur when the bridge topology allows for an skb to traverse more than one bridge. Signed-off-by: David Kimdon <david.kimdon@devicescape.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_netfilter.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 43a0b35dfe6f..23422bd53a5e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -369,6 +369,7 @@ static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
369 if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb)) 369 if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb))
370 goto inhdr_error; 370 goto inhdr_error;
371 371
372 nf_bridge_put(skb->nf_bridge);
372 if ((nf_bridge = nf_bridge_alloc(skb)) == NULL) 373 if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
373 return NF_DROP; 374 return NF_DROP;
374 setup_pre_routing(skb); 375 setup_pre_routing(skb);
@@ -452,6 +453,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
452 skb->ip_summed = CHECKSUM_NONE; 453 skb->ip_summed = CHECKSUM_NONE;
453 } 454 }
454 455
456 nf_bridge_put(skb->nf_bridge);
455 if ((nf_bridge = nf_bridge_alloc(skb)) == NULL) 457 if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
456 return NF_DROP; 458 return NF_DROP;
457 setup_pre_routing(skb); 459 setup_pre_routing(skb);