From: Oliver Hartkopp Date: Thu, 12 Jan 2023 19:23:47 +0000 (+0100) Subject: can: isotp: handle wait_event_interruptible() return values X-Git-Tag: baikal/aarch64/sdk6.1~89 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e41888181c195d108802550d71707e24bfc6762c;p=kernel.git can: isotp: handle wait_event_interruptible() return values commit 823b2e42720f96f277940c37ea438b7c5ead51a4 upstream. When wait_event_interruptible() has been interrupted by a signal the tx.state value might not be ISOTP_IDLE. Force the state machines into idle state to inhibit the timer handlers to continue working. Fixes: 2873f88fd708 ("can: isotp: fix tx state handling for echo tx processing") Cc: stable@vger.kernel.org Signed-off-by: Oliver Hartkopp Link: https://lore.kernel.org/all/20230112192347.1944-1-socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/can/isotp.c b/net/can/isotp.c index 0476a506d4a4e..fc81d77724a13 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1152,6 +1152,10 @@ static int isotp_release(struct socket *sock) /* wait for complete transmission of current pdu */ wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); + /* force state machines to be idle also when a signal occurred */ + so->tx.state = ISOTP_IDLE; + so->rx.state = ISOTP_IDLE; + spin_lock(&isotp_notifier_lock); while (isotp_busy_notifier == so) { spin_unlock(&isotp_notifier_lock);