Skip to content

Commit 823b2e4

Browse files
hartkoppmarckleinebudde
authored andcommitted
can: isotp: handle wait_event_interruptible() return values
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: 8663378 ("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>
1 parent 3793301 commit 823b2e4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/can/isotp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,10 @@ static int isotp_release(struct socket *sock)
11621162
/* wait for complete transmission of current pdu */
11631163
wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE);
11641164

1165+
/* force state machines to be idle also when a signal occurred */
1166+
so->tx.state = ISOTP_IDLE;
1167+
so->rx.state = ISOTP_IDLE;
1168+
11651169
spin_lock(&isotp_notifier_lock);
11661170
while (isotp_busy_notifier == so) {
11671171
spin_unlock(&isotp_notifier_lock);

0 commit comments

Comments
 (0)