diff options
| author |   Jon Hunter <jonathanh@nvidia.com> | 2019-06-26 11:23:21 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-26 09:10:24 -0700 |
| commit | 0867bb9768dedaae2c0e572ade5ccaa682a9298c (patch) | |
| tree | 11a38f45454d789acd81003ba4dd1c2b81620aa3 /drivers/net/ethernet/stmicro | |
| parent | ipv6: fix suspicious RCU usage in rt6_dump_route() (diff) | |
| download | linux-dev-0867bb9768dedaae2c0e572ade5ccaa682a9298c.tar.xz linux-dev-0867bb9768dedaae2c0e572ade5ccaa682a9298c.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index a48751989fa6..df9976cb0f47 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -402,6 +402,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv) netdev_dbg(priv->dev, "disable EEE\n"); del_timer_sync(&priv->eee_ctrl_timer); stmmac_set_eee_timer(priv, priv->hw, 0, tx_lpi_timer); + mutex_unlock(&priv->lock); return false; } |