net: stmmac: Fix possible deadlock when disabling EEE support
Subsystems (5)
Jon Hunter
maintainerPATCH 1/2 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.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
@@ -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; }
Signature · 1 line
1.9.1
Jon Hunter
maintainerPATCH 2/2 net: stmmac: Fix crash observed if PHY does not support EEE
If the PHY does not support EEE mode, then a crash is observed when the ethernet interface is enabled. The crash occurs, because if the PHY does not support EEE, then although the EEE timer is never configured, it is still marked as enabled and so the stmmac ethernet driver is still trying to update the timer by calling mod_timer(). This triggers a BUG() in the mod_timer() because we are trying to update a timer when there is no callback function set because timer_setup() was never called for this timer.
The problem is caused because we return true from the function stmmac_eee_init(), marking the EEE timer as enabled, even when we have not configured the EEE timer. Fix this by ensuring that we return false if the PHY does not support EEE and hence, 'eee_active' is not set.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +6 -4
@@ -398,10 +398,12 @@ bool stmmac_eee_init(struct stmmac_priv *priv)mutex_lock (&priv->lock);/* Check if it needs to be deactivated */ -if (!priv->eee_active && priv->eee_enabled) { -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); +if (!priv->eee_active) { +if (priv->eee_enabled) { +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; }
Signature · 1 line
1.9.1
Re: [PATCH 2/2] net: stmmac: Fix crash observed if PHY does not support EEE
Quoted 14 lines · Jon Hunter
If the PHY does not support EEE mode, then a crash is observed when the ethernet interface is enabled. The crash occurs, because if the PHY does not support EEE, then although the EEE timer is never configured, it is still marked as enabled and so the stmmac ethernet driver is still trying to update the timer by calling
mod_timer(). This triggers aBUG()in themod_timer()because we are trying to update a timer when there is no callback function set becausetimer_setup()was never called for this timer.The problem is caused because we return true from the function
stmmac_eee_init(), marking the EEE timer as enabled, even when we have not configured the EEE timer. Fix this by ensuring that we return false if the PHY does not support EEE and hence, 'eee_active' is not set.
Quoted 5 lines
Fixes 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")Signed-off-by Jon Hunter <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Thanks for hunting this down!
Re: [PATCH 2/2] net: stmmac: Fix crash observed if PHY does not support EEE
In reply to Jon HunterFrom: Jon Hunter <[email protected]>
Date: Wed, 26 Jun 2019 11:23:22 +0100
Quoted 9 lines
If the PHY does not support EEE mode, then a crash is observed when the ethernet interface is enabled. The crash occurs, because if the PHY does not support EEE, then although the EEE timer is never configured, it is still marked as enabled and so the stmmac ethernet driver is still trying to update the timer by calling
mod_timer(). This triggers aBUG()in themod_timer()because we are trying to update a timer when there is no callback function set becausetimer_setup()was never called for this timer.
Quoted 7 lines
The problem is caused because we return true from the function
stmmac_eee_init(), marking the EEE timer as enabled, even when we have not configured the EEE timer. Fix this by ensuring that we return false if the PHY does not support EEE and hence, 'eee_active' is not set.Fixes 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")Signed-off-by Jon Hunter <[email protected]>
Applied.
Quoted 11 lines · Jon Hunter
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 fromstmmax_eee_init()when stopping the EEE timer.Fixes 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")Signed-off-by Jon Hunter <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)
Willem de Bruijn
Acked-byQuoted 8 lines · Thierry Reding
Quoted 6 lines · Jon Hunter
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 fromstmmax_eee_init()when stopping the EEE timer.
Quoted 7 lines
Quoted 5 lines
Fixes 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")Signed-off-by Jon Hunter <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+)Tested-by Thierry Reding <[email protected]>
From: Jon Hunter <[email protected]>
Date: Wed, 26 Jun 2019 11:23:21 +0100
Quoted 8 lines
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 fromstmmax_eee_init()when stopping the EEE timer.Fixes 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")Signed-off-by Jon Hunter <[email protected]>
When targetting net-next for a set of changes, make this explicit and clear by saying "[PATCH net-next ...] ..." in your Subject lines in the future.
Applied.