Skip to content

Commit 6f68fc3

Browse files
committed
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: Jakub Kicinski <kuba@kernel.org>
2 parents fc06493 + e38910c commit 6f68fc3

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

net/can/isotp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,9 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
11121112
if (err)
11131113
goto err_event_drop;
11141114

1115-
if (sk->sk_err)
1116-
return -sk->sk_err;
1115+
err = sock_error(sk);
1116+
if (err)
1117+
return err;
11171118
}
11181119

11191120
return size;

0 commit comments

Comments
 (0)