From 55f84963de8796cddaf17f0295157a8564a35e19 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 21 Dec 2023 09:52:42 -0500 Subject: [PATCH] Fixes for 5.15 Signed-off-by: Sasha Levin --- ...-name-of-smb2_create_allocation_size.patch | 40 ++++++ queue-5.15/series | 2 + ...-fix-oob-in-smb2_query_reparse_point.patch | 120 ++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 queue-5.15/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch create mode 100644 queue-5.15/smb-client-fix-oob-in-smb2_query_reparse_point.patch diff --git a/queue-5.15/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch b/queue-5.15/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch new file mode 100644 index 00000000000..af9f2d4c39b --- /dev/null +++ b/queue-5.15/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch @@ -0,0 +1,40 @@ +From 4b485adef3c69ef6add345cd2b2ac0680a3df5ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Dec 2023 08:23:49 +0900 +Subject: ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE + +From: Namjae Jeon + +[ Upstream commit 13736654481198e519059d4a2e2e3b20fa9fdb3e ] + +MS confirm that "AISi" name of SMB2_CREATE_ALLOCATION_SIZE in MS-SMB2 +specification is a typo. cifs/ksmbd have been using this wrong name from +MS-SMB2. It should be "AlSi". Also It will cause problem when running +smb2.create.open test in smbtorture against ksmbd. + +Cc: stable@vger.kernel.org +Fixes: 12197a7fdda9 ("Clarify SMB2/SMB3 create context and add missing ones") +Signed-off-by: Namjae Jeon +Reviewed-by: Paulo Alcantara (SUSE) +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/smb2pdu.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h +index f32c99c9ba131..301c155c52677 100644 +--- a/fs/cifs/smb2pdu.h ++++ b/fs/cifs/smb2pdu.h +@@ -779,7 +779,7 @@ struct smb2_tree_disconnect_rsp { + #define SMB2_CREATE_SD_BUFFER "SecD" /* security descriptor */ + #define SMB2_CREATE_DURABLE_HANDLE_REQUEST "DHnQ" + #define SMB2_CREATE_DURABLE_HANDLE_RECONNECT "DHnC" +-#define SMB2_CREATE_ALLOCATION_SIZE "AISi" ++#define SMB2_CREATE_ALLOCATION_SIZE "AlSi" + #define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc" + #define SMB2_CREATE_TIMEWARP_REQUEST "TWrp" + #define SMB2_CREATE_QUERY_ON_DISK_ID "QFid" +-- +2.43.0 + diff --git a/queue-5.15/series b/queue-5.15/series index e69de29bb2d..c947eec3dbc 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -0,0 +1,2 @@ +ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch +smb-client-fix-oob-in-smb2_query_reparse_point.patch diff --git a/queue-5.15/smb-client-fix-oob-in-smb2_query_reparse_point.patch b/queue-5.15/smb-client-fix-oob-in-smb2_query_reparse_point.patch new file mode 100644 index 00000000000..6d27e033e9e --- /dev/null +++ b/queue-5.15/smb-client-fix-oob-in-smb2_query_reparse_point.patch @@ -0,0 +1,120 @@ +From 08a75a2d1df535db6b9a162b3f089c3b9a8dd2a0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Dec 2023 10:26:43 -0300 +Subject: smb: client: fix OOB in smb2_query_reparse_point() + +From: Paulo Alcantara + +[ Upstream commit 3a42709fa909e22b0be4bb1e2795aa04ada732a3 ] + +Validate @ioctl_rsp->OutputOffset and @ioctl_rsp->OutputCount so that +their sum does not wrap to a number that is smaller than @reparse_buf +and we end up with a wild pointer as follows: + + BUG: unable to handle page fault for address: ffff88809c5cd45f + #PF: supervisor read access in kernel mode + #PF: error_code(0x0000) - not-present page + PGD 4a01067 P4D 4a01067 PUD 0 + Oops: 0000 [#1] PREEMPT SMP NOPTI + CPU: 2 PID: 1260 Comm: mount.cifs Not tainted 6.7.0-rc4 #2 + Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS + rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 + RIP: 0010:smb2_query_reparse_point+0x3e0/0x4c0 [cifs] + Code: ff ff e8 f3 51 fe ff 41 89 c6 58 5a 45 85 f6 0f 85 14 fe ff ff + 49 8b 57 48 8b 42 60 44 8b 42 64 42 8d 0c 00 49 39 4f 50 72 40 <8b> + 04 02 48 8b 9d f0 fe ff ff 49 8b 57 50 89 03 48 8b 9d e8 fe ff + RSP: 0018:ffffc90000347a90 EFLAGS: 00010212 + RAX: 000000008000001f RBX: ffff88800ae11000 RCX: 00000000000000ec + RDX: ffff88801c5cd440 RSI: 0000000000000000 RDI: ffffffff82004aa4 + RBP: ffffc90000347bb0 R08: 00000000800000cd R09: 0000000000000001 + R10: 0000000000000000 R11: 0000000000000024 R12: ffff8880114d4100 + R13: ffff8880114d4198 R14: 0000000000000000 R15: ffff8880114d4000 + FS: 00007f02c07babc0(0000) GS:ffff88806ba00000(0000) + knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: ffff88809c5cd45f CR3: 0000000011750000 CR4: 0000000000750ef0 + PKRU: 55555554 + Call Trace: + + ? __die+0x23/0x70 + ? page_fault_oops+0x181/0x480 + ? search_module_extables+0x19/0x60 + ? srso_alias_return_thunk+0x5/0xfbef5 + ? exc_page_fault+0x1b6/0x1c0 + ? asm_exc_page_fault+0x26/0x30 + ? _raw_spin_unlock_irqrestore+0x44/0x60 + ? smb2_query_reparse_point+0x3e0/0x4c0 [cifs] + cifs_get_fattr+0x16e/0xa50 [cifs] + ? srso_alias_return_thunk+0x5/0xfbef5 + ? lock_acquire+0xbf/0x2b0 + cifs_root_iget+0x163/0x5f0 [cifs] + cifs_smb3_do_mount+0x5bd/0x780 [cifs] + smb3_get_tree+0xd9/0x290 [cifs] + vfs_get_tree+0x2c/0x100 + ? capable+0x37/0x70 + path_mount+0x2d7/0xb80 + ? srso_alias_return_thunk+0x5/0xfbef5 + ? _raw_spin_unlock_irqrestore+0x44/0x60 + __x64_sys_mount+0x11a/0x150 + do_syscall_64+0x47/0xf0 + entry_SYSCALL_64_after_hwframe+0x6f/0x77 + RIP: 0033:0x7f02c08d5b1e + +Fixes: 2e4564b31b64 ("smb3: add support for stat of WSL reparse points for special file types") +Cc: stable@vger.kernel.org +Reported-by: Robert Morris +Signed-off-by: Paulo Alcantara (SUSE) +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/smb2ops.c | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c +index 7c2ecbb17f542..f31da2647d042 100644 +--- a/fs/cifs/smb2ops.c ++++ b/fs/cifs/smb2ops.c +@@ -3263,7 +3263,7 @@ smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon, + struct kvec close_iov[1]; + struct smb2_ioctl_rsp *ioctl_rsp; + struct reparse_data_buffer *reparse_buf; +- u32 plen; ++ u32 off, count, len; + + cifs_dbg(FYI, "%s: path: %s\n", __func__, full_path); + +@@ -3343,16 +3343,22 @@ smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon, + */ + if (rc == 0) { + /* See MS-FSCC 2.3.23 */ ++ off = le32_to_cpu(ioctl_rsp->OutputOffset); ++ count = le32_to_cpu(ioctl_rsp->OutputCount); ++ if (check_add_overflow(off, count, &len) || ++ len > rsp_iov[1].iov_len) { ++ cifs_tcon_dbg(VFS, "%s: invalid ioctl: off=%d count=%d\n", ++ __func__, off, count); ++ rc = -EIO; ++ goto query_rp_exit; ++ } + +- reparse_buf = (struct reparse_data_buffer *) +- ((char *)ioctl_rsp + +- le32_to_cpu(ioctl_rsp->OutputOffset)); +- plen = le32_to_cpu(ioctl_rsp->OutputCount); +- +- if (plen + le32_to_cpu(ioctl_rsp->OutputOffset) > +- rsp_iov[1].iov_len) { +- cifs_tcon_dbg(FYI, "srv returned invalid ioctl len: %d\n", +- plen); ++ reparse_buf = (void *)((u8 *)ioctl_rsp + off); ++ len = sizeof(*reparse_buf); ++ if (count < len || ++ count < le16_to_cpu(reparse_buf->ReparseDataLength) + len) { ++ cifs_tcon_dbg(VFS, "%s: invalid ioctl: off=%d count=%d\n", ++ __func__, off, count); + rc = -EIO; + goto query_rp_exit; + } +-- +2.43.0 + -- 2.47.3