Commit e62091e6 authored by Dawei Li's avatar Dawei Li Committed by Zizhi Wo
Browse files

ksmbd: fix typo, syncronous->synchronous 

mainline inclusion
from mainline-v6.3-rc1
commit f8d6e744
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6KEWO?from=project-issue
CVE: CVE-2023-1193

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



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

syncronous->synchronous

Signed-off-by: default avatarDawei Li <set_pte_at@outlook.com>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarZizhi Wo <wozizhi@huawei.com>
parent a1aee52b

fs/ksmbd/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void ksmbd_conn_enqueue_request(struct ksmbd_work *work) 


	if (conn->ops->get_cmd_val(work) != SMB2_CANCEL_HE) {

		requests_queue = &conn->requests;

		work->syncronous = true;

		work->synchronous = true;

	}



	if (requests_queue) {
@@ -133,7 +133,7 @@ int ksmbd_conn_try_dequeue_request(struct ksmbd_work *work) 
	spin_lock(&conn->request_lock);

	if (!work->multiRsp) {

		list_del_init(&work->request_entry);

		if (work->syncronous == false)

		if (!work->synchronous)

			list_del_init(&work->async_request_entry);

		ret = 0;

	}

fs/ksmbd/ksmbd_work.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct ksmbd_work { 
	/* Request is encrypted */

	bool                            encrypted:1;

	/* Is this SYNC or ASYNC ksmbd_work */

	bool                            syncronous:1;

	bool                            synchronous:1;

	bool                            need_invalidate_rkey:1;



	unsigned int                    remote_key;

fs/ksmbd/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ int init_smb2_rsp_hdr(struct ksmbd_work *work) 
	rsp_hdr->SessionId = rcv_hdr->SessionId;

	memcpy(rsp_hdr->Signature, rcv_hdr->Signature, 16);



	work->syncronous = true;

	work->synchronous = true;

	if (work->async_id) {

		ksmbd_release_id(&conn->async_ida, work->async_id);

		work->async_id = 0;
@@ -682,7 +682,7 @@ int setup_async_work(struct ksmbd_work *work, void (*fn)(void **), void **arg) 
		pr_err("Failed to alloc async message id\n");

		return id;

	}

	work->syncronous = false;

	work->synchronous = false;

	work->async_id = id;

	rsp_hdr->Id.AsyncId = cpu_to_le64(id);