net: renesas: rswitch: avoid use-after-put for a device tree node

[ Upstream commit 66b7e9f85b8459c823b11e9af69dbf4be5eb6be8 ]

The device tree node saved in the rswitch_device structure is used at
several driver locations. So passing this node to of_node_put() after
the first use is wrong.

Move of_node_put() for this node to exit paths.

Fixes: b46f1e579329 ("net: renesas: rswitch: Simplify struct phy * handling")
Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://patch.msgid.link/20241208095004.69468-5-nikita.yoush@cogentembedded.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index af0bc95ad6aee92f3bb658453d89a39b883a8747..3b57abada20028ac418fba37f0b374ad9b901189 100644 (file)
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -1891,7 +1891,6 @@ static int rswitch_device_alloc(struct rswitch_private *priv, unsigned int index
        rdev->np_port = rswitch_get_port_node(rdev);
        rdev->disabled = !rdev->np_port;
        err = of_get_ethdev_address(rdev->np_port, ndev);
-       of_node_put(rdev->np_port);
        if (err) {
                if (is_valid_ether_addr(rdev->etha->mac_addr))
                        eth_hw_addr_set(ndev, rdev->etha->mac_addr);
@@ -1921,6 +1920,7 @@ out_txdmac:
 
 out_rxdmac:
 out_get_params:
+       of_node_put(rdev->np_port);
        netif_napi_del(&rdev->napi);
        free_netdev(ndev);
 
@@ -1934,6 +1934,7 @@ static void rswitch_device_free(struct rswitch_private *priv, unsigned int index
 
        rswitch_txdmac_free(ndev);
        rswitch_rxdmac_free(ndev);
+       of_node_put(rdev->np_port);
        netif_napi_del(&rdev->napi);
        free_netdev(ndev);
 }