Commit 8f15bccf authored by Namjae Jeon's avatar Namjae Jeon Committed by ZhaoLong Wang
Browse files

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 b53e8cfe 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: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhaoLong Wang <wangzhaolong1@huawei.com>
parent 9f126942

fs/ksmbd/smb_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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;