From: Pavel Skripkin <paskripkin@gmail.com> To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, kuba@kernel.org, buytenh@marvell.com, afleming@freescale.com, dan.carpenter@oracle.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Skripkin <paskripkin@gmail.com>, Yanfei Xu <yanfei.xu@windriver.com> Subject: [PATCH v2 1/2] Revert "net: mdiobus: Fix memory leak in __mdiobus_register" Date: Tue, 28 Sep 2021 23:39:15 +0300 [thread overview] Message-ID: <2324212c8d0a713eba0aae3c25635b3ca5c5243f.1632861239.git.paskripkin@gmail.com> (raw) In-Reply-To: <20210927112017.19108-1-paskripkin@gmail.com> This reverts commit ab609f25d19858513919369ff3d9a63c02cd9e2e. This patch is correct in the sense that we _should_ call device_put() in case of device_register() failure, but the problem in this code is more vast. We need to set bus->state to UNMDIOBUS_REGISTERED before calling device_register() to correctly release the device in mdiobus_free(). This patch prevents us from doing it, since in case of device_register() failure put_device() will be called 2 times and it will cause UAF or something else. Also, Reported-by: tag in revered commit was wrong, since syzbot reported different leak in same function. Link: https://lore.kernel.org/netdev/20210928092657.GI2048@kadam/ Cc: Yanfei Xu <yanfei.xu@windriver.com> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> --- Changes in v2: Added this revert --- drivers/net/phy/mdio_bus.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 6f4b4e5df639..53f034fc2ef7 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -537,7 +537,6 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) err = device_register(&bus->dev); if (err) { pr_err("mii_bus %s failed to register\n", bus->id); - put_device(&bus->dev); return -EINVAL; } -- 2.33.0
next prev parent reply other threads:[~2021-09-28 20:40 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-27 11:20 [PATCH] phy: mdio: fix memory leak Pavel Skripkin 2021-09-27 19:17 ` Pavel Skripkin 2021-09-28 20:39 ` Pavel Skripkin [this message] 2021-09-28 20:40 ` [PATCH v2 2/2] " Pavel Skripkin 2021-09-29 6:22 ` Dan Carpenter 2021-09-29 23:48 ` Jakub Kicinski 2021-09-30 5:55 ` Pavel Skripkin 2021-09-29 6:32 ` [PATCH v2 1/2] Revert "net: mdiobus: Fix memory leak in __mdiobus_register" Xu, Yanfei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2324212c8d0a713eba0aae3c25635b3ca5c5243f.1632861239.git.paskripkin@gmail.com \ --to=paskripkin@gmail.com \ --cc=afleming@freescale.com \ --cc=andrew@lunn.ch \ --cc=buytenh@marvell.com \ --cc=dan.carpenter@oracle.com \ --cc=davem@davemloft.net \ --cc=hkallweit1@gmail.com \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=netdev@vger.kernel.org \ --cc=yanfei.xu@windriver.com \ --subject='Re: [PATCH v2 1/2] Revert "net: mdiobus: Fix memory leak in __mdiobus_register"' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).