Commit 20bc17be authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by openeuler-sync-bot
Browse files

ravb: Fix use-after-free issue in ravb_tx_timeout_work()

stable inclusion
from stable-v5.10.199
commit db9aafa19547833240f58c2998aed7baf414dc82
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7EDZ1
CVE: CVE-2023-35827

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=db9aafa19547833240f58c2998aed7baf414dc82



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

commit 39714428 upstream.

The ravb_stop() should call cancel_work_sync(). Otherwise,
ravb_tx_timeout_work() is possible to use the freed priv after
ravb_remove() was called like below:

CPU0			CPU1
			ravb_tx_timeout()
ravb_remove()
unregister_netdev()
free_netdev(ndev)
// free priv
			ravb_tx_timeout_work()
			// use priv

unregister_netdev() will call .ndo_stop() so that ravb_stop() is
called. And, after phy_stop() is called, netif_carrier_off()
is also called. So that .ndo_tx_timeout() will not be called
after phy_stop().

Fixes: c156633f ("Renesas Ethernet AVB driver proper")
Reported-by: default avatarZheng Wang <zyytlz.wz@163.com>
Closes: https://lore.kernel.org/netdev/20230725030026.1664873-1-zyytlz.wz@163.com/


Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20231005011201.14368-3-yoshihiro.shimoda.uh@renesas.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
(cherry picked from commit bbae0caa)
parent 3b063171
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,8 @@ static int ravb_close(struct net_device *ndev)
			of_phy_deregister_fixed_link(np);
	}

	cancel_work_sync(&priv->work);

	if (priv->chip_id != RCAR_GEN2) {
		free_irq(priv->tx_irqs[RAVB_NC], ndev);
		free_irq(priv->rx_irqs[RAVB_NC], ndev);