Commit 454bbe59 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: fix PTP error cleanup in __stmmac_open() 



The cleanup function for stmmac_setup_ptp() is stmmac_release_ptp()
which entirely undoes the effects of stmmac_setup_ptp() by
unregistering the PTP device and then stopping the PTP clock,
whereas stmmac_hw_teardown() will only stop the PTP clock while
leaving the PTP device registered.

This can lead to a kernel oops - if __stmmac_open() fails after
registering the PTP clock, the PTP device will remain registered,
and if the module is removed, subsequent PTP device accesses will
lead to a kernel oops.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 99a8789a

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4032,7 +4032,7 @@ static int __stmmac_open(struct net_device *dev, 
	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)

		hrtimer_cancel(&priv->dma_conf.tx_queue[chan].txtimer);



	stmmac_hw_teardown(dev);

	stmmac_release_ptp(priv);

init_error:

	phylink_disconnect_phy(priv->phylink);

init_phy_error: