]> www.infradead.org Git - users/dwmw2/linux.git/commit
net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
authorXie He <xie.he.0141@gmail.com>
Mon, 28 Dec 2020 02:53:39 +0000 (18:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Jan 2021 19:09:08 +0000 (20:09 +0100)
commitba1c72ef111cd6df714cadf13e2f4860bb50275d
tree5b0858f0b33f10c09069d0a818fd00d81e738515
parent8452e205048172dd4dca906e5d1729a5cfe3b22e
net: hdlc_ppp: Fix issues when mod_timer is called while timer is running

[ Upstream commit 1fef73597fa545c35fddc953979013882fbd4e55 ]

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.

Fixes: e022c2f07ae5 ("WAN: new synchronous PPP implementation for generic HDLC.")
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Xie He <xie.he.0141@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wan/hdlc_ppp.c