Commit c567ed5d authored by Nikita Yushchenko's avatar Nikita Yushchenko Committed by Bowen You
Browse files

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

stable inclusion
from stable-v6.6.67
commit bf8c6755f02029d1eddc3ff19b870240f054afc7
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBIO14
CVE: CVE-2024-55639

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bf8c6755f02029d1eddc3ff19b870240f054afc7



--------------------------------

[ 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: b46f1e57 ("net: renesas: rswitch: Simplify struct phy * handling")
Signed-off-by: default avatarNikita Yushchenko <nikita.yoush@cogentembedded.com>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://patch.msgid.link/20241208095004.69468-5-nikita.yoush@cogentembedded.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarBowen You <youbowen2@huawei.com>
parent de7233ed

drivers/net/ethernet/renesas/rswitch.c

+2 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ static int rswitch_device_alloc(struct rswitch_private *priv, 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);
@@ -1771,6 +1770,7 @@ static int rswitch_device_alloc(struct rswitch_private *priv, int index) 


out_rxdmac:

out_get_params:

	of_node_put(rdev->np_port);

	netif_napi_del(&rdev->napi);

	free_netdev(ndev);
@@ -1784,6 +1784,7 @@ static void rswitch_device_free(struct rswitch_private *priv, int index) 


	rswitch_txdmac_free(ndev);

	rswitch_rxdmac_free(ndev);

	of_node_put(rdev->np_port);

	netif_napi_del(&rdev->napi);

	free_netdev(ndev);

}