diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2023-01-12 20:23:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-09 11:28:15 +0100 |
| commit | ad88608681417996a603eb78bd63ac940be097c2 (patch) | |
| tree | 8c6edb28d6fd489dad741e097e55ec5b90f8bc38 /net | |
| parent | cae4c9bc35f72af5d4a079bb9d9fd62c4088a411 (diff) | |
| download | linux-riscv-ad88608681417996a603eb78bd63ac940be097c2.tar.gz linux-riscv-ad88608681417996a603eb78bd63ac940be097c2.tar.bz2 linux-riscv-ad88608681417996a603eb78bd63ac940be097c2.zip | |
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 0476a506d4a4..fc81d77724a1 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); |