Commit 1bf5b513 authored by Wang Hai's avatar Wang Hai Committed by Wang Liang
Browse files

net: systemport: fix potential memory leak in bcm_sysport_xmit() 

mainline inclusion
from mainline-v6.12-rc4
commit c401ed1c709948e57945485088413e1bb5e94bd1
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2STJ
CVE: CVE-2024-50171

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c401ed1c709948e57945485088413e1bb5e94bd1



--------------------------------

The bcm_sysport_xmit() returns NETDEV_TX_OK without freeing skb
in case of dma_map_single() fails, add dev_kfree_skb() to fix it.

Fixes: 80105bef ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Link: https://patch.msgid.link/20241014145115.44977-1-wanghai38@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarWang Liang <wangliang74@huawei.com>
parent 87fa1e0e

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, 
		netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",

			  skb->data, skb_len);

		ret = NETDEV_TX_OK;

		dev_kfree_skb_any(skb);

		goto out;

	}