lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge br_multicast: Fix skb leakage in error path.

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明
2010-03-15 19:26:56 +00:00
committed by David S. Miller
parent 0ba8c9ec25
commit 8440853bb7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/bridge/br_multicast.c
View File

@@ -991,7 +991,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
err = pskb_trim_rcsum(skb2, len); err = pskb_trim_rcsum(skb2, len);
if (err) if (err)
return err; goto err_out;
} }
len -= ip_hdrlen(skb2); len -= ip_hdrlen(skb2);
@@ -1013,7 +1013,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
case CHECKSUM_NONE: case CHECKSUM_NONE:
skb2->csum = 0; skb2->csum = 0;
if (skb_checksum_complete(skb2)) if (skb_checksum_complete(skb2))
return -EINVAL; goto out;
} }
err = 0; err = 0;
@@ -1040,6 +1040,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
out: out:
__skb_push(skb2, offset); __skb_push(skb2, offset);
err_out:
if (skb2 != skb) if (skb2 != skb)
kfree_skb(skb2); kfree_skb(skb2);
return err; return err;