Commit cbcca2e3 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: phylink: don't call netif_carrier_off() with NULL netdev 



Dan Carpenter points out that we have a code path that permits a NULL
netdev pointer to be passed to netif_carrier_off(), which will cause
a kernel oops. In any case, we need to set pl->old_link_state to false
to have the desired effect when there is no netdev present.

Fixes: f9749365 ("net: phylink: add suspend/resume support")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4fc29989

drivers/net/phy/phylink.c

+4 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,10 @@ void phylink_suspend(struct phylink *pl, bool mac_wol) 
		 * but one would hope all packets have been sent. This

		 * also means phylink_resolve() will do nothing.

		 */

		if (pl->netdev)

			netif_carrier_off(pl->netdev);

		else

			pl->old_link_state = false;



		/* We do not call mac_link_down() here as we want the

		 * link to remain up to receive the WoL packets.