be2net: fix potential memory leak in be_xmit()
authorWang Hai <wanghai38@huawei.com>
Tue, 15 Oct 2024 14:48:02 +0000 (22:48 +0800)
committerAndrew Lunn <andrew@lunn.ch>
Sat, 19 Oct 2024 21:06:08 +0000 (16:06 -0500)
The be_xmit() returns NETDEV_TX_OK without freeing skb
in case of be_xmit_enqueue() fails, add dev_kfree_skb_any() to fix it.

Fixes: 760c295e0e8d ("be2net: Support for OS2BMC.")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Message-ID: <20241015144802.12150-1-wanghai38@huawei.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
drivers/net/ethernet/emulex/benet/be_main.c

index a8596ebcdfd60e8d7418b63a3dedf8ed1af29d9b..875fe379eea213abcb69de189602bcacbcaa6f56 100644 (file)
@@ -1381,10 +1381,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
        be_get_wrb_params_from_skb(adapter, skb, &wrb_params);
 
        wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
-       if (unlikely(!wrb_cnt)) {
-               dev_kfree_skb_any(skb);
-               goto drop;
-       }
+       if (unlikely(!wrb_cnt))
+               goto drop_skb;
 
        /* if os2bmc is enabled and if the pkt is destined to bmc,
         * enqueue the pkt a 2nd time with mgmt bit set.
@@ -1393,7 +1391,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
                BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);
                wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
                if (unlikely(!wrb_cnt))
-                       goto drop;
+                       goto drop_skb;
                else
                        skb_get(skb);
        }
@@ -1407,6 +1405,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
                be_xmit_flush(adapter, txo);
 
        return NETDEV_TX_OK;
+drop_skb:
+       dev_kfree_skb_any(skb);
 drop:
        tx_stats(txo)->tx_drv_drops++;
        /* Flush the already enqueued tx requests */