diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-07-29 01:12:31 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-30 23:36:57 -0700 |
| commit | 6d1d1d398cb7db7a12c5d652d50f85355345234f (patch) | |
| tree | 9075ad9f7889079f91b430e7cc404a7d9cee696a /net/bridge | |
| parent | a3bdb549e30e7a263f7a589747c40e9c50110315 (diff) | |
| download | op-kernel-dev-6d1d1d398cb7db7a12c5d652d50f85355345234f.zip op-kernel-dev-6d1d1d398cb7db7a12c5d652d50f85355345234f.tar.gz | |
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')
| -rw-r--r-- | net/bridge/br_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 4cec805..f49bcd9 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) rcu_read_lock(); if (is_multicast_ether_addr(dest)) { - if (br_multicast_rcv(br, NULL, skb)) + if (br_multicast_rcv(br, NULL, skb)) { + kfree_skb(skb); goto out; + } mdst = br_mdb_get(br, skb); if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) |
