diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-23 06:02:11 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-23 06:02:11 +0300 |
| commit | 6f68fc395f49fb43f6ae801c340953ee4f793e98 (patch) | |
| tree | 17585a21c3b80c64db71dff3a7015f9d384ff0ab /net | |
| parent | fc0649395dca81f2b3b02d9b248acb38cbcee55c (diff) | |
| parent | e38910c0072b541a91954682c8b074a93e57c09b (diff) | |
| download | linux-6f68fc395f49fb43f6ae801c340953ee4f793e98.tar.xz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/isotp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/can/isotp.c b/net/can/isotp.c index 84f9aba02901..ca9d728d6d72 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1112,8 +1112,9 @@ wait_free_buffer: if (err) goto err_event_drop; - if (sk->sk_err) - return -sk->sk_err; + err = sock_error(sk); + if (err) + return err; } return size; |