Commit 97b7d869 authored by Tong Zhang's avatar Tong Zhang Committed by Wenyu Huang
Browse files

net: macb: fix use after free on rmmod 

stable inclusion
from stable-v4.19.209
commit 46670fb832ee80943715df618632ca13c2e96f2b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4OO
CVE: CVE-2021-47372

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=46670fb832ee80943715df618632ca13c2e96f2b



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

[ Upstream commit d82d5303 ]

plat_dev->dev->platform_data is released by platform_device_unregister(),
use of pclk and hclk is a use-after-free. Since device unregister won't
need a clk device we adjust the function call sequence to fix this issue.

[   31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
[   31.275563] Freed by task 306:
[   30.276782]  platform_device_release+0x25/0x80

Suggested-by: default avatarNicolas Ferre <Nicolas.Ferre@microchip.com>
Signed-off-by: default avatarTong Zhang <ztong0001@gmail.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWenyu Huang <huangwenyu5@huawei.com>
parent 0a378cfa

drivers/net/ethernet/cadence/macb_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ static void macb_remove(struct pci_dev *pdev) 
	struct platform_device *plat_dev = pci_get_drvdata(pdev);

	struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);



	platform_device_unregister(plat_dev);

	clk_unregister(plat_data->pclk);

	clk_unregister(plat_data->hclk);

	platform_device_unregister(plat_dev);

}



static const struct pci_device_id dev_id_table[] = {