diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2023-06-27 09:45:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2023-06-27 09:45:22 -0700 |
| commit | 3674fbf0451df0395f9fa18df3122927006a3829 (patch) | |
| tree | 632690d6c74a7bedb166299bbc92059cd3a537f9 /net/can | |
| parent | Revert "af_unix: Call scm_recv() only after scm_set_cred()." (diff) | |
| parent | netlink: Add __sock_i_ino() for __netlink_diag_dump(). (diff) | |
| download | linux-3674fbf0451df0395f9fa18df3122927006a3829.tar.gz linux-3674fbf0451df0395f9fa18df3122927006a3829.tar.bz2 linux-3674fbf0451df0395f9fa18df3122927006a3829.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.5 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/can')
| -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 1f25b45868cf..99770ed28531 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; |