Unverified Commit a1c988d0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1605 CVE-2023-38430 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PLIYRODHJZO5O3JJ5LZMDZ5VC2QZZXUQ/ 
Li Nan (1):
  ksmbd: define SMB2_COMPRESSION_TRANSFORM_ID in fs/ksmbd/smb2pdu.h

Namjae Jeon (1):
  ksmbd: validate smb request protocol id


-- 
2.39.2
 
https://gitee.com/openeuler/kernel/issues/I7LU2S 
 
Link:https://gitee.com/openeuler/kernel/pulls/1605

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 303e4578 c8b52f21

fs/ksmbd/connection.c

+3 −2
Original line number Diff line number Diff line
@@ -329,8 +329,6 @@ int ksmbd_conn_handler_loop(void *p) 
			continue;



		memcpy(conn->request_buf, hdr_buf, sizeof(hdr_buf));

		if (!ksmbd_smb_request(conn))

			break;



		/*

		 * We already read 4 bytes to find out PDU size, now
@@ -348,6 +346,9 @@ int ksmbd_conn_handler_loop(void *p) 
			continue;

		}



		if (!ksmbd_smb_request(conn))

			break;



		if (!default_conn_ops.process_fn) {

			pr_err("No connection request callback\n");

			break;

fs/ksmbd/smb2pdu.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 


#define SMB2_PROTO_NUMBER cpu_to_le32(0x424d53fe) /* 'B''M''S' */

#define SMB2_TRANSFORM_PROTO_NUM cpu_to_le32(0x424d53fd)

#define SMB2_COMPRESSION_TRANSFORM_ID cpu_to_le32(0x424d53fc)



#define SMB21_DEFAULT_IOSIZE	(1024 * 1024)

#define SMB3_DEFAULT_IOSIZE	(4 * 1024 * 1024)

fs/ksmbd/smb_common.c

+13 −1
Original line number Diff line number Diff line
@@ -156,7 +156,19 @@ int ksmbd_verify_smb_message(struct ksmbd_work *work) 
 */

bool ksmbd_smb_request(struct ksmbd_conn *conn)

{

	return conn->request_buf[0] == 0;

	__le32 *proto = (__le32 *)smb2_get_msg(conn->request_buf);



	if (*proto == SMB2_COMPRESSION_TRANSFORM_ID) {

		pr_err_ratelimited("smb2 compression not support yet");

		return false;

	}



	if (*proto != SMB1_PROTO_NUMBER &&

	    *proto != SMB2_PROTO_NUMBER &&

	    *proto != SMB2_TRANSFORM_PROTO_NUM)

		return false;



	return true;

}



static bool supported_protocol(int idx)