Commit 6f68fc39 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.4-20230622' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can 2023-06-22

Oliver Hartkopp's patch fixes the return value in the error path of
isotp_sendmsg() in the CAN ISOTP protocol.

* tag 'linux-can-fixes-for-6.4-20230622' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: isotp: isotp_sendmsg(): fix return error fix on TX path
====================

Link: https://lore.kernel.org/r/20230622090122.574506-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fc064939 e38910c0

net/can/isotp.c

+3 −2
Original line number Diff line number Diff line
@@ -1112,8 +1112,9 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
		if (err)

			goto err_event_drop;



		if (sk->sk_err)

			return -sk->sk_err;

		err = sock_error(sk);

		if (err)

			return err;

	}



	return size;