aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-07-28 21:12:31 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-31 02:36:57 -0400
commit6d1d1d398cb7db7a12c5d652d50f85355345234f (patch)
tree9075ad9f7889079f91b430e7cc404a7d9cee696a /net/bridge/br_device.c
parenta3bdb549e30e7a263f7a589747c40e9c50110315 (diff)
bridge: Fix skb leak when multicast parsing fails on TX
On the bridge TX path we're leaking an skb when br_multicast_rcv returns an error. Reported-by: David Lamparter <equinox@diac24.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 4cec8051164d..f49bcd9d9113 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -48,8 +48,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
48 48
49 rcu_read_lock(); 49 rcu_read_lock();
50 if (is_multicast_ether_addr(dest)) { 50 if (is_multicast_ether_addr(dest)) {
51 if (br_multicast_rcv(br, NULL, skb)) 51 if (br_multicast_rcv(br, NULL, skb)) {
52 kfree_skb(skb);
52 goto out; 53 goto out;
54 }
53 55
54 mdst = br_mdb_get(br, skb); 56 mdst = br_mdb_get(br, skb);
55 if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) 57 if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))