]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: bcmasp: fix early exit leak with fixed phy
authorJustin Chen <justin.chen@broadcom.com>
Thu, 22 Jan 2026 19:40:01 +0000 (11:40 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Jan 2026 18:50:49 +0000 (10:50 -0800)
We are not deregistering the fixed phy link when hitting the early
exit condition. Add the correct early exit sequence.

Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet controller")
Signed-off-by: Justin Chen <justin.chen@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20260122194001.1098859-1-justin.chen@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

index b9973956c48095347abddef457136c0fbd6278d6..ceb6c11431dd9c4faadaa1b5e007a3d5e1341616 100644 (file)
@@ -1261,7 +1261,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
                netdev_err(intf->ndev, "invalid PHY mode: %s for port %d\n",
                           phy_modes(intf->phy_interface), intf->port);
                ret = -EINVAL;
-               goto err_free_netdev;
+               goto err_deregister_fixed_link;
        }
 
        ret = of_get_ethdev_address(ndev_dn, ndev);
@@ -1286,6 +1286,9 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
 
        return intf;
 
+err_deregister_fixed_link:
+       if (of_phy_is_fixed_link(ndev_dn))
+               of_phy_deregister_fixed_link(ndev_dn);
 err_free_netdev:
        free_netdev(ndev);
 err: