From: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
commit 9ad1da14ab3bf23087ae45fe399d84a109ddb81a upstream.
Addresses an issue where a CAN bus error during a BAM transmission
could stall the socket queue, preventing further transmissions even
after the bus error is resolved. The fix activates the next queued
session after the error recovery, allowing communication to continue.
Fixes: 9d71dd0c70099 ("can: add support of SAE J1939 protocol")
Cc: stable@xxxxxxxxxxxxxxx
Reported-by: Alexander Hölzl <alexander.hoelzl@xxxxxxx>
Tested-by: Alexander Hölzl <alexander.hoelzl@xxxxxxx>
Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20240528070648.1947203-1-o.rempel@xxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/can/j1939/transport.c | 2 ++
1 file changed, 2 insertions(+)
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1681,6 +1681,8 @@ static int j1939_xtp_rx_rts_session_acti
j1939_session_timers_cancel(session);
j1939_session_cancel(session, J1939_XTP_ABORT_BUSY);
+ if (session->transmission)
+ j1939_session_deactivate_activate_next(session);
return -EBUSY;
}
Patches currently in stable-queue which might be from o.rempel@xxxxxxxxxxxxxx are
queue-6.9/net-can-j1939-enhanced-error-handling-for-tightly-received-rts-messages-in-xtp_rx_rts_session_new.patch
queue-6.9/net-can-j1939-initialize-unused-data-in-j1939_send_one.patch
queue-6.9/net-can-j1939-recover-socket-queue-on-can-bus-error-during-bam-transmission.patch
