| From f3555a863c3fbaaceb036652189fbe1d75498196 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 8 Dec 2024 14:50:04 +0500 |
| Subject: net: renesas: rswitch: avoid use-after-put for a device tree node |
| |
| From: Nikita Yushchenko <nikita.yoush@cogentembedded.com> |
| |
| [ 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> |
| --- |
| drivers/net/ethernet/renesas/rswitch.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c |
| index b1432ca79f1e..d04a79ece698 100644 |
| --- a/drivers/net/ethernet/renesas/rswitch.c |
| +++ b/drivers/net/ethernet/renesas/rswitch.c |
| @@ -1819,7 +1819,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); |
| @@ -1849,6 +1848,7 @@ static int rswitch_device_alloc(struct rswitch_private *priv, unsigned int index |
| |
| out_rxdmac: |
| out_get_params: |
| + of_node_put(rdev->np_port); |
| netif_napi_del(&rdev->napi); |
| free_netdev(ndev); |
| |
| @@ -1862,6 +1862,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); |
| } |
| -- |
| 2.39.5 |
| |
