UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux-can-fixes-for-6.4-20230622 

-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEDs2BvajyNKlf9TJQvlAcSiqKBOgFAmSUCoQTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRC+UBxKKooE6LexB/4/mLkfaVHHqnyrlM7yUHww5xxPaAW1
 pBhv8iyWgxkqueXIK2XL3ihhGVaf9toiwwcNDXPuDfykjMaYQkk04K+tVzgoc17P
 iWCTwIxeuNvplww1d4g+ii2uzhacLfJoGlVGc5wc+aca0Jw7RiHOYqU8f5XTRVEs
 IUiRSk4uK5Y4rizN2RIysRUgUxrNCgbqbvtTfopKLxfBq3g7PsuJV+SQvRyAFYdZ
 NLaO3j5/q45PvjMraUYq148ry+vBUVF+QSrMZfPLl+TiqFIsnFbiejXpQriFOJgc
 nxWgJPMF1Welh50mzrdGQG2b+y+sqwnQGgB3pTklMASGYxQIV+QVV6CC
 =qTzE
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Jakub Kicinski 2023-06-22 20:02:11 -07:00
parent fc0649395d e38910c007
commit 6f68fc395f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/can/isotp.c
View File

@ -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;