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

ksmbd: return unsupported error on smb1 mount 

stable inclusion
from stable-v5.15.105
commit 51a8534c0f35c0401e45f1055f914729cad98bf9
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=51a8534c0f35c0401e45f1055f914729cad98bf9



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

commit 39b291b8 upstream.

ksmbd disconnect connection when mounting with vers=smb1.
ksmbd should send smb1 negotiate response to client for correct
unsupported error return. This patch add needed SMB1 macros and fill
NegProt part of the response for smb1 negotiate response.

Cc: stable@vger.kernel.org
Reported-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
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>
Conflicts:
    fs/ksmbd/connection.c
Signed-off-by: default avatarZhaoLong Wang <wangzhaolong1@huawei.com>
parent 8f15bccf

fs/ksmbd/connection.c

+2 −5
Original line number Diff line number Diff line
@@ -339,13 +339,10 @@ int ksmbd_conn_handler_loop(void *p) 
		}



		/*

		 * Check if pdu size is valid (min : smb header size,

		 * max : 0x00FFFFFF).

		 * Check maximum pdu size(0x00FFFFFF).

		 */

		if (pdu_size < __SMB2_HEADER_STRUCTURE_SIZE ||

		    pdu_size > MAX_STREAM_PROT_LEN) {

		if (pdu_size > MAX_STREAM_PROT_LEN)

			break;

		}



		/* 4 for rfc1002 length field */

		/* 1 for implied bcc[0] */

fs/ksmbd/smb_common.c

+20 −3
Original line number Diff line number Diff line
@@ -450,9 +450,26 @@ static int smb_handle_negotiate(struct ksmbd_work *work) 
{

	struct smb_negotiate_rsp *neg_rsp = work->response_buf;



	ksmbd_debug(SMB, "Unsupported SMB protocol\n");

	neg_rsp->hdr.Status.CifsError = STATUS_INVALID_LOGON_TYPE;

	return -EINVAL;

	ksmbd_debug(SMB, "Unsupported SMB1 protocol\n");



	/*

	 * Remove 4 byte direct TCP header, add 2 byte bcc and

	 * 2 byte DialectIndex.

	 */

	*(__be32 *)work->response_buf =

		cpu_to_be32(sizeof(struct smb_hdr) - 4 + 2 + 2);

	neg_rsp->hdr.Status.CifsError = STATUS_SUCCESS;



	neg_rsp->hdr.Command = SMB_COM_NEGOTIATE;

	*(__le32 *)neg_rsp->hdr.Protocol = SMB1_PROTO_NUMBER;

	neg_rsp->hdr.Flags = SMBFLG_RESPONSE;

	neg_rsp->hdr.Flags2 = SMBFLG2_UNICODE | SMBFLG2_ERR_STATUS |

		SMBFLG2_EXT_SEC | SMBFLG2_IS_LONG_NAME;



	neg_rsp->hdr.WordCount = 1;

	neg_rsp->DialectIndex = cpu_to_le16(work->conn->dialect);

	neg_rsp->ByteCount = 0;

	return 0;

}



int ksmbd_smb_negotiate_common(struct ksmbd_work *work, unsigned int command)

fs/ksmbd/smb_common.h

+8 −22
Original line number Diff line number Diff line
@@ -205,8 +205,15 @@ 


#define SMB1_PROTO_NUMBER		cpu_to_le32(0x424d53ff)

#define SMB_COM_NEGOTIATE		0x72



#define SMB1_CLIENT_GUID_SIZE		(16)



#define SMBFLG_RESPONSE 0x80	/* this PDU is a response from server */



#define SMBFLG2_IS_LONG_NAME	cpu_to_le16(0x40)

#define SMBFLG2_EXT_SEC		cpu_to_le16(0x800)

#define SMBFLG2_ERR_STATUS	cpu_to_le16(0x4000)

#define SMBFLG2_UNICODE		cpu_to_le16(0x8000)



struct smb_hdr {

	__be32 smb_buf_length;

	__u8 Protocol[4];
@@ -246,28 +253,7 @@ struct smb_negotiate_req { 
struct smb_negotiate_rsp {

	struct smb_hdr hdr;     /* wct = 17 */

	__le16 DialectIndex; /* 0xFFFF = no dialect acceptable */

	__u8 SecurityMode;

	__le16 MaxMpxCount;

	__le16 MaxNumberVcs;

	__le32 MaxBufferSize;

	__le32 MaxRawSize;

	__le32 SessionKey;

	__le32 Capabilities;    /* see below */

	__le32 SystemTimeLow;

	__le32 SystemTimeHigh;

	__le16 ServerTimeZone;

	__u8 EncryptionKeyLength;

	__le16 ByteCount;

	union {

		unsigned char EncryptionKey[8]; /* cap extended security off */

		/* followed by Domain name - if extended security is off */

		/* followed by 16 bytes of server GUID */

		/* then security blob if cap_extended_security negotiated */

		struct {

			unsigned char GUID[SMB1_CLIENT_GUID_SIZE];

			unsigned char SecurityBlob[1];

		} __packed extended_response;

	} __packed u;

} __packed;



struct filesystem_attribute_info {