summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2018-11-28 15:30:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-17 09:38:34 +0100
commit1bb6e0ccbc4d42280d997b1e4a527e59bc14904f (patch)
tree0c03ff923b8607c70cc93b0b8ef7eef18ff6d7ad /drivers
parent992963c693c56bef8c08e400f52cfdeda53f79af (diff)
net: hisilicon: remove unexpected free_netdev
[ Upstream commit c758940158bf29fe14e9d0f89d5848f227b48134 ] The net device ndev is freed via free_netdev when failing to register the device. The control flow then jumps to the error handling code block. ndev is used and freed again. Resulting in a use-after-free bug. Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/hisilicon/hip04_eth.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
index 39778892b3b3..b5d18d95d7b9 100644
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
@@ -922,10 +922,8 @@ static int hip04_mac_probe(struct platform_device *pdev)
}
ret = register_netdev(ndev);
- if (ret) {
- free_netdev(ndev);
+ if (ret)
goto alloc_fail;
- }
return 0;