projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9a5974
)
can: c_can_pci: c_can_pci_remove(): fix use-after-free
author
Tong Zhang
<ztong0001@gmail.com>
Mon, 1 Mar 2021 02:45:11 +0000
(21:45 -0500)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 30 Mar 2021 12:31:59 +0000
(14:31 +0200)
[ Upstream commit
0429d6d89f97ebff4f17f13f5b5069c66bde8138
]
There is a UAF in c_can_pci_remove(). dev is released by
free_c_can_dev() and is used by pci_iounmap(pdev, priv->base) later.
To fix this issue, save the mmio address before releasing dev.
Fixes:
5b92da0443c2
("c_can_pci: generic module for C_CAN/D_CAN on PCI")
Link:
https://lore.kernel.org/r/20210301024512.539039-1-ztong0001@gmail.com
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/c_can/c_can_pci.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/c_can/c_can_pci.c
b/drivers/net/can/c_can/c_can_pci.c
index
406b484
..
7efb60b
100644
(file)
--- a/
drivers/net/can/c_can/c_can_pci.c
+++ b/
drivers/net/can/c_can/c_can_pci.c
@@
-239,12
+239,13
@@
static void c_can_pci_remove(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct c_can_priv *priv = netdev_priv(dev);
+ void __iomem *addr = priv->base;
unregister_c_can_dev(dev);
free_c_can_dev(dev);
- pci_iounmap(pdev,
priv->base
);
+ pci_iounmap(pdev,
addr
);
pci_disable_msi(pdev);
pci_clear_master(pdev);
pci_release_regions(pdev);