FAILED: patch "[PATCH] ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x dc8289f912387c3bcfbc5d2db29c8947fa207c11
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041022-perish-activator-cd4b@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
dc8289f91238 ("ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr") 39b291b86b59 ("ksmbd: return unsupported error on smb1 mount") b53e8cfec30b ("ksmbd: return STATUS_NOT_SUPPORTED on unsupported smb2.0 dialect") 62c487b53a7f ("ksmbd: limit pdu length size according to connection status") cb4517201b8a ("ksmbd: remove smb2_buf_length in smb2_hdr") 341b16014bf8 ("ksmdb: use cmd helper variable in smb2_get_ksmbd_tcon()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From dc8289f912387c3bcfbc5d2db29c8947fa207c11 Mon Sep 17 00:00:00 2001
From: Namjae Jeon <[email protected]>
Date: Sat, 1 Apr 2023 13:21:04 +0900
Subject: [PATCH] ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr
When smb1 mount fails, KASAN detect slab-out-of-bounds in init_smb2_rsp_hdr like the following one.
For smb1 negotiate(56bytes) , init_smb2_rsp_hdr() for smb2 is called. The issue occurs while handling smb1 negotiate as smb2 server operations. Add smb server operations for smb1 (get_cmd_val, init_rsp_hdr, allocate_rsp_buf, check_user_session) to handle smb1 negotiate so that smb2 server operation does not handle it.
[ 411.400423] CIFS: VFS: Use of the less secure dialect vers=1.0 is not recommended unless required for access to very old servers [ 411.400452] CIFS: Attempting to mount \\192.168.45.139\homes [ 411.479312] ksmbd: init_smb2_rsp_hdr : 492 [ 411.479323] ================================================================== [ 411.479327] BUG: KASAN: slab-out-of-bounds in init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479369] Read of size 16 at addr ffff888488ed0734 by task kworker/14:1/199
[ 411.479379] CPU: 14 PID: 199 Comm: kworker/14:1 Tainted: G OE 6.1.21 #3 [ 411.479386] Hardware name: ASUSTeK COMPUTER INC. Z10PA-D8 Series/Z10PA-D8 Series, BIOS 3801 08/23/2019 [ 411.479390] Workqueue: ksmbd-io handle_ksmbd_work [ksmbd] [ 411.479425] Call Trace: [ 411.479428] <TASK> [ 411.479432] dump_stack_lvl+0x49/0x63 [ 411.479444] print_report+0x171/0x4a8 [ 411.479452] ? kasan_complete_mode_report_info+0x3c/0x200 [ 411.479463] ? init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479497] kasan_report+0xb4/0x130 [ 411.479503] ? init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479537] kasan_check_range+0x149/0x1e0 [ 411.479543] memcpy+0x24/0x70 [ 411.479550] init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479585] handle_ksmbd_work+0x109/0x760 [ksmbd] [ 411.479616] ? _raw_spin_unlock_irqrestore+0x50/0x50 [ 411.479624] ? smb3_encrypt_resp+0x340/0x340 [ksmbd] [ 411.479656] process_one_work+0x49c/0x790 [ 411.479667] worker_thread+0x2b1/0x6e0 [ 411.479674] ? process_one_work+0x790/0x790 [ 411.479680] kthread+0x177/0x1b0 [ 411.479686] ? kthread_complete_and_exit+0x30/0x30 [ 411.479692] ret_from_fork+0x22/0x30 [ 411.479702] </TASK>
fs/ksmbd/server.c +1 -4
@@ -289,10 +289,7 @@ static int queue_ksmbd_work(struct ksmbd_conn *conn) work->request_buf = conn->request_buf; conn->request_buf =NULL ; -if (ksmbd_init_smb_server (work)) { -ksmbd_free_work_struct (work); -return -EINVAL ; - } +ksmbd_init_smb_server (work);ksmbd_conn_enqueue_request (work);atomic_inc (&conn->r_count);
fs/ksmbd/smb2pdu.c +0 -3
@@ -229,9 +229,6 @@ int init_smb2_neg_rsp(struct ksmbd_work *work)struct smb2_negotiate_rsp *rsp;struct ksmbd_conn *conn = work->conn; -if (conn->need_neg == false) -return -EINVAL ; - *(__be32 *)work->response_buf =cpu_to_be32 (conn->vals->header_size);
fs/ksmbd/smb_common.c +109 -29
173 lines not on this page · raw message
fs/ksmbd/smb_common.h +1 -1
@@ -427,7 +427,7 @@ bool ksmbd_smb_request(struct ksmbd_conn *conn);int ksmbd_lookup_dialect_by_id (__le16 *cli_dialects,__le16 dialects_count); -int ksmbd_init_smb_server (struct ksmbd_work *work); +void ksmbd_init_smb_server (struct ksmbd_work *work);struct ksmbd_kstat ; int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work,