瀏覽代碼

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>
Herbert Xu 15 年之前
父節點
當前提交
6d1d1d398c
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      net/bridge/br_device.c

+ 3 - 1
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();
 	rcu_read_lock();
 	if (is_multicast_ether_addr(dest)) {
 	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;
 			goto out;
+		}
 
 
 		mdst = br_mdb_get(br, skb);
 		mdst = br_mdb_get(br, skb);
 		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
 		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))