diff options
| author | Namjae Jeon <linkinjeon@kernel.org> | 2024-04-10 15:36:58 +0800 |
|---|---|---|
| committer | ZhaoLong Wang <wangzhaolong1@huawei.com> | 2024-04-10 15:41:19 +0800 |
| commit | 565028b9d9c30e4232bfa27b24f46f602d1d0036 (patch) | |
| tree | 456a9250a1f0c0565de9971acf7a20541e82ac43 | |
| parent | a14becaa2c7249689e69ff9920a5cd8b1b9d184f (diff) | |
| download | openEuler-kernel-565028b9d9c30e4232bfa27b24f46f602d1d0036.tar.gz | |
ksmbd: return STATUS_NOT_SUPPORTED on unsupported smb2.0 dialect
stable inclusion
from stable-v5.15.105
commit 496e186bc005fa4a4d9cf14e0662ae00b60e1362
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I92OOJ
CVE: CVE-2023-52441
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=496e186bc005fa4a4d9cf14e0662ae00b60e1362
--------------------------------
commit b53e8cfec30b93c120623232ba27c041b1ef8f1a upstream.
ksmbd returned "Input/output error" when mounting with vers=2.0 to
ksmbd. It should return STATUS_NOT_SUPPORTED on unsupported smb2.0
dialect.
Cc: stable@vger.kernel.org
Reported-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: ZhaoLong Wang <wangzhaolong1@huawei.com>
| -rw-r--r-- | fs/ksmbd/smb_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ksmbd/smb_common.c b/fs/ksmbd/smb_common.c index ff2e738ae7ac0f..49c6ada3fba79b 100644 --- a/fs/ksmbd/smb_common.c +++ b/fs/ksmbd/smb_common.c @@ -442,7 +442,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, static int __smb2_negotiate(struct ksmbd_conn *conn) { - return (conn->dialect >= SMB21_PROT_ID && + return (conn->dialect >= SMB20_PROT_ID && conn->dialect <= SMB311_PROT_ID); } @@ -473,7 +473,7 @@ int ksmbd_smb_negotiate_common(struct ksmbd_work *work, unsigned int command) } } - if (command == SMB2_NEGOTIATE_HE && __smb2_negotiate(conn)) { + if (command == SMB2_NEGOTIATE_HE) { ret = smb2_handle_negotiate(work); init_smb2_neg_rsp(work); return ret; |