Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: stmmac: Fix possible deadlock when disabling EEE support

When stmmac_eee_init() is called to disable EEE support, then the timer
for EEE support is stopped and we return from the function. Prior to
stopping the timer, a mutex was acquired but in this case it is never
released and so could cause a deadlock. Fix this by releasing the mutex
prior to returning from stmmax_eee_init() when stopping the EEE timer.

Fixes: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jon Hunter and committed by
David S. Miller
0867bb97 3b525691

+1
+1
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
··· 402 402 netdev_dbg(priv->dev, "disable EEE\n"); 403 403 del_timer_sync(&priv->eee_ctrl_timer); 404 404 stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer); 405 + mutex_unlock(&priv->lock); 405 406 return false; 406 407 } 407 408