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

ksmbd: not allow guest user on multichannel 

mainline inclusion
from mainline-v6.4-rc1
commit 3353ab2d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I74FMP
CVE: CVE-2023-32249

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3353ab2df5f68dab7da8d5ebb427a2d265a1f2b2



--------------------------------

This patch return STATUS_NOT_SUPPORTED if binding session is guest.

Cc: stable@vger.kernel.org
Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-20480
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarZhaoLong Wang <wangzhaolong1@huawei.com>
parent 5c18a2ed

fs/ksmbd/smb2pdu.c

+9 −2
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static int ntlm_authenticate(struct ksmbd_work *work, 
		 * Reuse session if anonymous try to connect

		 * on reauthetication.

		 */

		if (ksmbd_anonymous_user(user)) {

		if (conn->binding == false && ksmbd_anonymous_user(user)) {

			ksmbd_free_user(user);

			return 0;

		}
@@ -1495,7 +1495,7 @@ static int ntlm_authenticate(struct ksmbd_work *work, 
		sess->user = user;

	}



	if (user_guest(sess->user)) {

	if (conn->binding == false && user_guest(sess->user)) {

		rsp->SessionFlags = SMB2_SESSION_FLAG_IS_GUEST_LE;

	} else {

		struct authenticate_message *authblob;
@@ -1739,6 +1739,11 @@ int smb2_sess_setup(struct ksmbd_work *work) 
			goto out_err;

		}



		if (user_guest(sess->user)) {

			rc = -EOPNOTSUPP;

			goto out_err;

		}



		conn->binding = true;

	} else if ((conn->dialect < SMB30_PROT_ID ||

		    server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL) &&
@@ -1863,6 +1868,8 @@ int smb2_sess_setup(struct ksmbd_work *work) 
		rsp->hdr.Status = STATUS_NETWORK_SESSION_EXPIRED;

	else if (rc == -ENOMEM)

		rsp->hdr.Status = STATUS_INSUFFICIENT_RESOURCES;

	else if (rc == -EOPNOTSUPP)

		rsp->hdr.Status = STATUS_NOT_SUPPORTED;

	else if (rc)

		rsp->hdr.Status = STATUS_LOGON_FAILURE;