Skip to contentSkip to conversation

net: qcom/emac: fix UAF in emac_remove

PATCH Applied Pavel Skripkin 3 participants 5 messages Jul 9, 2021 – Jul 10, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: qcom/emac: fix UAF in emac_remove

adpt is netdev private data and it cannot be
used after free_netdev() call. Using adpt after free_netdev() can cause UAF bug. Fix it by moving free_netdev() at the end of the function.

Fixes 54e19bc74f33 ("net: qcom/emac: do not use devm on internal phy pdev")
---
 drivers/net/ethernet/qualcomm/emac/emac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qualcomm/emac/emac.c +2 -1
index 8543bf3c3484..ad655f0a4965 100644
@@ -735,12 +735,13 @@ static int emac_remove(struct platform_device *pdev)
 
 	put_device(&adpt->phydev->mdio.dev);
 	mdiobus_unregister(adpt->mii_bus);
-	free_netdev(netdev);
 
 	if (adpt->phy.digital)
 		iounmap(adpt->phy.digital);
 	iounmap(adpt->phy.base);
 
+	free_netdev(netdev);
+
 	return 0;
 }
 
Signature · 1 line
2.32.0
#1 lore raw
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

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

Quoted 9 lines · On Fri, 9 Jul 2021 17:24:18 +0300 you wrote:

adpt is netdev private data and it cannot be
used after free_netdev() call. Using adpt after free_netdev() can cause UAF bug. Fix it by moving free_netdev() at the end of the function.

Fixes 54e19bc74f33 ("net: qcom/emac: do not use devm on internal phy pdev")

[...]

Here is the summary with links:
- net: qcom/emac: fix UAF in emac_remove

    https://git.kernel.org/netdev/net/c/ad297cd2db89

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

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Pavel Skripkin
Quoted 5 lines · Pavel Skripkin

adpt is netdev private data and it cannot be
used after free_netdev() call. Using adpt after free_netdev() can cause UAF bug. Fix it by moving free_netdev() at the end of the function.

Please spell out what "UAF" means, thanks. If you fix that, then

Thanks.

#3 lore raw
Quoted 8 lines · On Sat, 10 Jul 2021 00:02:26 -0500 Timur Tabi <[email protected]> wrote:
Quoted 5 lines · Pavel Skripkin

adpt is netdev private data and it cannot be
used after free_netdev() call. Using adpt after free_netdev() can cause UAF bug. Fix it by moving free_netdev() at the end of the function.

Quoted 5 lines

Please spell out what "UAF" means, thanks. If you fix that, then

Thanks.

Hi, Timur!

Thank you for feedback.

David has already applied this pacth. So, should I send v2 or maybe revert + v2? I haven't been in such situations yet :)

With regards,
Pavel Skripkin

maintainer
#4 lore raw
Quoted 2 lines · Pavel Skripkin

David has already applied this pacth. So, should I send v2 or maybe revert + v2? I haven't been in such situations yet :)

No, don't worry about it.