iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-can-fixes-for-5.15-20211019

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAmFub7gTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRCpyVqK+u3vqf6yCACAiYQuk1sRh7/b6G4Qk2QUTWUxhG/T
 NWAOVuYMJkvGAMRAxjA7ecwRqA19/WIS2ys00t8UW62mvFGrGfcSBXWj3baPnx7w
 rfhyd+gk1LqOjWcaQriDmLO2ERY27roNA7FMtcMCoRlbYkrnYcFyKUMdhQXSW3/R
 /5KIEWBFzmr6ISUBUpkOeDs3irjy3ScIE0fEBt1+Uu3XydFWt7qnrMqBGlwoc9Xs
 du5VN5nWTZzdB9ju7p0PyrYdwoHsa1L1XbnIJd1hTLCua38028nuL9v7OGy3QvwN
 1Tz10PTnTk+2KMCkR4AwuzEBcHBVIcNmTrpTQAKiecB0QbXQlR9es0J5
 =9TSz
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
David S. Miller 2021-10-19 13:14:36 +01:00
commit 04ee2752a5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/can/isotp.c
View File

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