diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2023-01-12 20:23:47 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-02-02 10:33:26 +0100 |
| commit | 823b2e42720f96f277940c37ea438b7c5ead51a4 (patch) | |
| tree | 2366535c9dcd945ebbe611d7e22bf2d622eca403 | |
| parent | 3793301cbaa4a62d83e21f685307da7671f812ab (diff) | |
| download | linux-stable-823b2e42720f96f277940c37ea438b7c5ead51a4.tar.gz linux-stable-823b2e42720f96f277940c37ea438b7c5ead51a4.tar.bz2 linux-stable-823b2e42720f96f277940c37ea438b7c5ead51a4.zip | |
can: isotp: handle wait_event_interruptible() return values
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: 866337865f37 ("can: isotp: fix tx state handling for echo tx processing")
Cc: stable@vger.kernel.org
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/all/20230112192347.1944-1-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | net/can/isotp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/can/isotp.c b/net/can/isotp.c index 608f8c24ae46..dae421f6c901 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1162,6 +1162,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); |