net: hns: Fix missing put_device() call in hns_mac_register_phy
Subsystems (3)
PATCH 1/1 net: hns: Fix missing put_device() call in hns_mac_register_phy
We need to drop the reference taken by hns_dsaf_find_platform_device Missing put_device() may cause refcount leak.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +1 -0
@@ -764,6 +764,7 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)dev_err (mac_cb->dev,"mac%d mdio is NULL, dsaf will probe again later\n" , mac_cb->mac_id); +put_device (&pdev->dev);return -EPROBE_DEFER ; }
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerQuoted 14 lines · On Mon, 10 Jan 2022 06:40:29 +0000 Miaoqian Lin wrote:
We need to drop the reference taken by
hns_dsaf_find_platform_deviceMissingput_device()may cause refcount leak.Fixes 804ffe5c6197 ("net: hns: support deferred probe when no mdio")Signed-off-by Miaoqian Lin <[email protected]>--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 1 + 1 file changed, 1 insertion(+)drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +0
-0
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c static int hns_mac_register_phy(struct hns_mac_cb *mac_cb) · line 770
Quoted 7 lines
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +1
-0@@ -764,6 +764,7 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)dev_err (mac_cb->dev,"mac%d mdio is NULL, dsaf will probe again later\n" , mac_cb->mac_id); +put_device (&pdev->dev);return -EPROBE_DEFER ; }
With more context:
@@ -755,24 +755,25 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)
pdev = hns_dsaf_find_platform_device(args.fwnode);
if (!pdev) {
dev_err(mac_cb->dev, "mac%d mdio pdev is NULL\n",
mac_cb->mac_id);
return -EINVAL;
}
mii_bus = platform_get_drvdata(pdev);
if (!mii_bus) {
dev_err(mac_cb->dev,
"mac%d mdio is NULL, dsaf will probe again later\n",
mac_cb->mac_id);
+ put_device(&pdev->dev);
return -EPROBE_DEFER;
}
rc = hns_mac_register_phydev(mii_bus, mac_cb, addr);
if (!rc)
dev_dbg(mac_cb->dev, "mac%d register phy addr:%d\n",
mac_cb->mac_id, addr);
return rc;}
Looks like if put_device() is missing it will also be missing in case hns_mac_register_phydev() returns an error.
PATCH v2 1/1 net: hns: Fix missing put_device() call in hns_mac_register_phy
We need to drop the reference taken by hns_dsaf_find_platform_device Missing put_device() may cause refcount leak.
---
Changes in v2:
- add put_device when hns_mac_register_phydev fails.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +4 -1
@@ -764,13 +764,16 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)dev_err (mac_cb->dev,"mac%d mdio is NULL, dsaf will probe again later\n" , mac_cb->mac_id); +put_device (&pdev->dev);return -EPROBE_DEFER ; } rc =hns_mac_register_phydev (mii_bus, mac_cb, addr); -if (!rc) +if (!rc) {dev_dbg (mac_cb->dev,"mac%d register phy addr:%d\n" , mac_cb->mac_id, addr); +put_device (&pdev->dev); + }return rc; }
Signature · 1 line
2.17.1
Quoted 2 lines · Miaoqian Lin
We need to drop the reference taken by
hns_dsaf_find_platform_deviceMissingput_device()may cause refcount leak.
Is the put also missing on driver unload?
As a fix for net, it might be better to rename dsaf_find_platform_device() to dsaf_get_platform_device() and add a dsaf_put_platform_device(). Add similar undo functions where ever needed, and make sure they get called.
Andrew