2021-03-07 08:45:57

by Jia-Ju Bai

Subject: [PATCH] net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch()

When hns_assemble_skb() returns NULL to skb, no error return code of
hns_nic_clear_all_rx_fetch() is assigned.
To fix this bug, ret is assigned with -ENOMEM in this case.

Reported-by: TOTE Robot <[email protected]>
Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 5d7824d2b4d4..c66a7a51198e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1663,8 +1663,10 @@ static int hns_nic_clear_all_rx_fetch(struct net_device *ndev)
for (j = 0; j < fetch_num; j++) {
/* alloc one skb and init */
skb = hns_assemble_skb(ndev);
- if (!skb)
+ if (!skb) {
+ ret = -ENOMEM;
goto out;
+ }
rd = &tx_ring_data(priv, skb->queue_mapping);
hns_nic_net_xmit_hw(ndev, skb, rd);

--
2.17.1

2021-03-08 20:01:41

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch()

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sun, 7 Mar 2021 00:40:12 -0800 you wrote:
> When hns_assemble_skb() returns NULL to skb, no error return code of
> hns_nic_clear_all_rx_fetch() is assigned.
> To fix this bug, ret is assigned with -ENOMEM in this case.
>
> Reported-by: TOTE Robot <[email protected]>
> Signed-off-by: Jia-Ju Bai <[email protected]>
>
> [...]

Here is the summary with links:
- net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch()
https://git.kernel.org/netdev/net/c/143c253f42ba

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html