net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
Subsystems (3)
PATCH v2 1/1 net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
ppp_cp_event is called directly or indirectly by ppp_rx with "ppp->lock" held. It may call mod_timer to add a new timer. However, at the same time ppp_timer may be already running and waiting for "ppp->lock". In this case, there's no need for ppp_timer to continue running and it can just exit.
If we let ppp_timer continue running, it may call add_timer. This causes kernel panic because add_timer can't be called with a timer pending. This patch fixes this problem.
--- drivers/net/wan/hdlc_ppp.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wan/hdlc_ppp.c +7 -0
@@ -569,6 +569,13 @@ static void ppp_timer(struct timer_list *t)unsigned long flags;spin_lock_irqsave (&ppp->lock, flags); +/* mod_timer could be called after we entered this function but +* before we got the lock. +*/ +if (timer_pending (&proto->timer)) { +spin_unlock_irqrestore (&ppp->lock, flags); +return ; + }switch (proto->state) {case STOPPING :case REQ_SENT :
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 10 lines · Hillf Danton
Quoted 5 lines · On Sun, 27 Dec 2020 18:53:39 -0800 Xie He wrote:
ppp_cp_eventis called directly or indirectly byppp_rxwith "ppp->lock" held. It may callmod_timerto add a new timer. However, at the same timeppp_timermay be already running and waiting for "ppp->lock". In this case, there's no need forppp_timerto continue running and it can just exit.Because the timer callback loses the race in acquiring the
ppp->lockdoes not mean it should abort.
I think aborting ppp_timer is the correct solution. When mod_timer is called by ppp_cp_event, which is (directly or indirectly) called by ppp_rx, this means we received something on the line that makes the original timer no longer necessary. If the timer is pending, mod_timer will delete it. If the timer is running and waiting for the lock, I think it should abort. This way it would appear that the timer hasn't fired and is deleted before it fires.
Quoted 5 lines
Quoted 2 lines
If we let
ppp_timercontinue running, it may calladd_timer. This causes kernel panic becauseadd_timercan't be called with a timer pending.Meanwhie we can defuse the peril following
add_timer()added ine022c2f07ae5, say by replacingadd_timer()withmod_timer().
The code path that calls add_timer is for sending keep-alive packets when operating in the OPENED state. If we have just changed to the OPENED state in ppp_cp_event, we should wait for the amount of time set by the (2nd) mod_timer call in ppp_cp_event, before firing the timer. We shouldn't fire the timer immediately after we change to the OPENED state. This is not the intention of the (2nd) mod_timer call in ppp_cp_event. Therefore aborting ppp_timer is the correct solution.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Hillf Danton
Quoted 5 lines
The code path that calls
add_timeris for sending keep-alive packets when operating in the OPENED state. If we have just changed to the OPENED state inppp_cp_event, we should wait for the amount of time set by the (2nd)mod_timercall inppp_cp_event, before firing theWhat if your change also covers the first case of
mod_timer()inppp_cp_event()?
Yes, for the 1st mod_timer call in ppp_cp_event, the situation is the same. If it is called, it means we are sending out a Configure Request or Terminate Request. In this case, we should wait for the amount of time set by this mod_timer call, before firing the timer. We shouldn't fire the timer immediately because this is not the intention of this mod_timer call.
Quoted 6 lines
Quoted 4 lines
timer. We shouldn't fire the timer immediately after we change to the OPENED state. This is not the intention of the (2nd)
mod_timercall inppp_cp_event. Therefore abortingppp_timeris the correct solution.Given an expiring timer, is it the right time to call
ppp_tx_flush()in addition to add/mod_timer()?
Do you mean when we are aborting ppp_timer, whether we need to call ppp_tx_flush in the aborted ppp_timer? I don't think so. Because when ppp_rx (which directly or indirectly calls ppp_cp_event) releases the lock, it will call ppp_tx_flush. So we don't need to call it again.
David Miller
maintainerFrom: Xie He <[email protected]>
Date: Sun, 27 Dec 2020 18:53:39 -0800
Quoted 6 lines
ppp_cp_eventis called directly or indirectly byppp_rxwith "ppp->lock" held. It may callmod_timerto add a new timer. However, at the same timeppp_timermay be already running and waiting for "ppp->lock". In this case, there's no need forppp_timerto continue running and it can just exit.
Quoted 7 lines
If we let
ppp_timercontinue running, it may calladd_timer. This causes kernel panic becauseadd_timercan't be called with a timer pending. This patch fixes this problem.Fixes e022c2f07ae5 ("WAN: new synchronous PPP implementation for generic HDLC.")Cc Krzysztof Halasa <[email protected]>Signed-off-by Xie He <[email protected]>
Applied and queued up for -stable, thanks!