Commit 04ee2752 authored Oct 19, 2021 by David S. Miller

Merge tag 'linux-can-fixes-for-5.15-20211019' of...

Merge tag 'linux-can-fixes-for-5.15-20211019' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2021-10-19

this is a pull request of a single patch for net/master.

The patch is by me and fixes the error handling in case of a FC
timeout in the TX path of the ISOTOP CAN protocol.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents c69b2f46 d674a8f1

net/can/isotp.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -971,6 +971,9 @@ static int isotp_sendmsg(struct socket sock, struct msghdr msg, size_t size)
		if (wait_tx_done) {
		/* wait for complete transmission of current pdu */
		wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE);

		if (sk->sk_err)
		return -sk->sk_err;
		}

		return size;