diff options
author | 2023-05-05 19:16:58 -0700 | |
---|---|---|
committer | 2023-05-05 19:16:58 -0700 | |
commit | 2e1e1337881b0e9844d687982aa54b31b1269b11 (patch) | |
tree | b2b4928a43728adef2c0685d78b196a2f81cc483 /fs/ksmbd/transport_tcp.c | |
parent | Merge tag 'net-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
parent | ksmbd: call rcu_barrier() in ksmbd_server_exit() (diff) | |
download | linux-2e1e1337881b0e9844d687982aa54b31b1269b11.tar.gz linux-2e1e1337881b0e9844d687982aa54b31b1269b11.tar.bz2 linux-2e1e1337881b0e9844d687982aa54b31b1269b11.zip |
Merge tag '6.4-rc-ksmbd-server-fixes-part2' of git://git.samba.org/ksmbd
Pull ksmbd server fixes from Steve French:
"Ten ksmbd server fixes, including some important security fixes:
- Two use after free fixes
- Fix RCU callback race
- Deadlock fix
- Three patches to prevent session setup attacks
- Prevent guest users from establishing multichannel sessions
- Fix null pointer dereference in query FS info
- Memleak fix"
* tag '6.4-rc-ksmbd-server-fixes-part2' of git://git.samba.org/ksmbd:
ksmbd: call rcu_barrier() in ksmbd_server_exit()
ksmbd: fix racy issue under cocurrent smb2 tree disconnect
ksmbd: fix racy issue from smb2 close and logoff with multichannel
ksmbd: not allow guest user on multichannel
ksmbd: fix deadlock in ksmbd_find_crypto_ctx()
ksmbd: block asynchronous requests when making a delay on session setup
ksmbd: destroy expired sessions
ksmbd: fix racy issue from session setup and logoff
ksmbd: fix NULL pointer dereference in smb2_get_info_filesystem()
ksmbd: fix memleak in session setup
Diffstat (limited to 'fs/ksmbd/transport_tcp.c')
-rw-r--r-- | fs/ksmbd/transport_tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ksmbd/transport_tcp.c b/fs/ksmbd/transport_tcp.c index 20e85e2701f2..eff7a1d793f0 100644 --- a/fs/ksmbd/transport_tcp.c +++ b/fs/ksmbd/transport_tcp.c @@ -333,7 +333,7 @@ static int ksmbd_tcp_readv(struct tcp_transport *t, struct kvec *iov_orig, if (length == -EINTR) { total_read = -ESHUTDOWN; break; - } else if (conn->status == KSMBD_SESS_NEED_RECONNECT) { + } else if (ksmbd_conn_need_reconnect(conn)) { total_read = -EAGAIN; break; } else if (length == -ERESTARTSYS || length == -EAGAIN) { |