From: Oleksij Rempel Date: Tue, 28 May 2024 07:06:48 +0000 (+0200) Subject: net: can: j1939: recover socket queue on CAN bus error during BAM transmission X-Git-Tag: v6.10-rc6~35^2~19^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ad1da14ab3bf23087ae45fe399d84a109ddb81a;p=thirdparty%2Flinux.git net: can: j1939: recover socket queue on CAN bus error during BAM transmission 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@vger.kernel.org Reported-by: Alexander Hölzl Tested-by: Alexander Hölzl Signed-off-by: Oleksij Rempel Link: https://lore.kernel.org/all/20240528070648.1947203-1-o.rempel@pengutronix.de Cc: stable@vger.kernel.org Signed-off-by: Marc Kleine-Budde --- diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index c6569f98d2514..4be73de5033cb 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1696,6 +1696,8 @@ static int j1939_xtp_rx_rts_session_active(struct j1939_session *session, j1939_session_timers_cancel(session); j1939_session_cancel(session, J1939_XTP_ABORT_BUSY); + if (session->transmission) + j1939_session_deactivate_activate_next(session); return -EBUSY; }