This is a note to let you know that I've just added the patch titled
can: isotp: handle wait_event_interruptible() return values
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
can-isotp-handle-wait_event_interruptible-return-values.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 823b2e42720f96f277940c37ea438b7c5ead51a4 Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Date: Thu, 12 Jan 2023 20:23:47 +0100
Subject: can: isotp: handle wait_event_interruptible() return values
From: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
Signed-off-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20230112192347.1944-1-socketcan@xxxxxxxxxxxx
Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/can/isotp.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -1152,6 +1152,10 @@ static int isotp_release(struct socket *
/* 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);
Patches currently in stable-queue which might be from socketcan@xxxxxxxxxxxx are
queue-6.1/can-isotp-split-tx-timer-into-transmission-and-timeout.patch
queue-6.1/can-isotp-handle-wait_event_interruptible-return-values.patch
queue-6.1/can-raw-fix-can-fd-frame-transmissions-over-can-xl-d.patch
