2024-05-28 07:07:24

by Oleksij Rempel

Subject: [PATCH 1/1] 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: [email protected]
Reported-by: Alexander Hölzl <[email protected]>
Tested-by: Alexander Hölzl <[email protected]>
Signed-off-by: Oleksij Rempel <[email protected]>
---
net/can/j1939/transport.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index fe3df23a25957..9805124d16763 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1681,6 +1681,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;
}
--
2.39.2

2024-05-28 13:35:12

by Markus Elfring

Subject: Re: [PATCH] j1939: recover socket queue on CAN bus error during BAM transmission

> … The fix activates the next queued session after
…

Please choose an imperative change description.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc1#n94

Regards,
Markus