From 416a834cc9c99b90ab4482d252fc6e541930a15b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Mar 2023 14:35:37 +0200 Subject: [PATCH] 5.15-stable patches added patches: ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch ksmbd-return-unsupported-error-on-smb1-mount.patch ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch wifi-mac80211-fix-qos-on-mesh-interfaces.patch --- ...ported-on-unsupported-smb2.0-dialect.patch | 42 ++++++ ...turn-unsupported-error-on-smb1-mount.patch | 124 ++++++++++++++++++ ...ttribute-in-fs_attribute_information.patch | 36 +++++ ...el-infoleak-in-nilfs_ioctl_wrap_copy.patch | 86 ++++++++++++ queue-5.15/series | 5 + ...-mac80211-fix-qos-on-mesh-interfaces.patch | 43 ++++++ 6 files changed, 336 insertions(+) create mode 100644 queue-5.15/ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch create mode 100644 queue-5.15/ksmbd-return-unsupported-error-on-smb1-mount.patch create mode 100644 queue-5.15/ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch create mode 100644 queue-5.15/nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch create mode 100644 queue-5.15/wifi-mac80211-fix-qos-on-mesh-interfaces.patch diff --git a/queue-5.15/ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch b/queue-5.15/ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch new file mode 100644 index 00000000000..cb534c01485 --- /dev/null +++ b/queue-5.15/ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch @@ -0,0 +1,42 @@ +From b53e8cfec30b93c120623232ba27c041b1ef8f1a Mon Sep 17 00:00:00 2001 +From: Namjae Jeon +Date: Tue, 21 Mar 2023 15:36:40 +0900 +Subject: ksmbd: return STATUS_NOT_SUPPORTED on unsupported smb2.0 dialect + +From: Namjae Jeon + +commit b53e8cfec30b93c120623232ba27c041b1ef8f1a upstream. + +ksmbd returned "Input/output error" when mounting with vers=2.0 to +ksmbd. It should return STATUS_NOT_SUPPORTED on unsupported smb2.0 +dialect. + +Cc: stable@vger.kernel.org +Reported-by: Steve French +Signed-off-by: Namjae Jeon +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/ksmbd/smb_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/fs/ksmbd/smb_common.c ++++ b/fs/ksmbd/smb_common.c +@@ -434,7 +434,7 @@ int ksmbd_extract_shortname(struct ksmbd + + static int __smb2_negotiate(struct ksmbd_conn *conn) + { +- return (conn->dialect >= SMB21_PROT_ID && ++ return (conn->dialect >= SMB20_PROT_ID && + conn->dialect <= SMB311_PROT_ID); + } + +@@ -464,7 +464,7 @@ int ksmbd_smb_negotiate_common(struct ks + } + } + +- if (command == SMB2_NEGOTIATE_HE && __smb2_negotiate(conn)) { ++ if (command == SMB2_NEGOTIATE_HE) { + ret = smb2_handle_negotiate(work); + init_smb2_neg_rsp(work); + return ret; diff --git a/queue-5.15/ksmbd-return-unsupported-error-on-smb1-mount.patch b/queue-5.15/ksmbd-return-unsupported-error-on-smb1-mount.patch new file mode 100644 index 00000000000..2e9375a4ba4 --- /dev/null +++ b/queue-5.15/ksmbd-return-unsupported-error-on-smb1-mount.patch @@ -0,0 +1,124 @@ +From 39b291b86b5988bf8753c3874d5c773399d09b96 Mon Sep 17 00:00:00 2001 +From: Namjae Jeon +Date: Thu, 23 Mar 2023 21:15:52 +0900 +Subject: ksmbd: return unsupported error on smb1 mount + +From: Namjae Jeon + +commit 39b291b86b5988bf8753c3874d5c773399d09b96 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: Steve French +Reviewed-by: Sergey Senozhatsky +Signed-off-by: Namjae Jeon +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/ksmbd/connection.c | 7 ++----- + fs/ksmbd/smb_common.c | 23 ++++++++++++++++++++--- + fs/ksmbd/smb_common.h | 30 ++++++++---------------------- + 3 files changed, 30 insertions(+), 30 deletions(-) + +--- a/fs/ksmbd/connection.c ++++ b/fs/ksmbd/connection.c +@@ -313,13 +313,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 */ + size = pdu_size + 4; +--- a/fs/ksmbd/smb_common.c ++++ b/fs/ksmbd/smb_common.c +@@ -442,9 +442,26 @@ static int smb_handle_negotiate(struct k + { + 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) +--- a/fs/ksmbd/smb_common.h ++++ b/fs/ksmbd/smb_common.h +@@ -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 { diff --git a/queue-5.15/ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch b/queue-5.15/ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch new file mode 100644 index 00000000000..225cf62b6e6 --- /dev/null +++ b/queue-5.15/ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch @@ -0,0 +1,36 @@ +From 728f14c72b71a19623df329c1c7c9d1452e56f1e Mon Sep 17 00:00:00 2001 +From: Namjae Jeon +Date: Wed, 1 Mar 2023 00:02:30 +0900 +Subject: ksmbd: set FILE_NAMED_STREAMS attribute in FS_ATTRIBUTE_INFORMATION + +From: Namjae Jeon + +commit 728f14c72b71a19623df329c1c7c9d1452e56f1e upstream. + +If vfs objects = streams_xattr in ksmbd.conf FILE_NAMED_STREAMS should +be set to Attributes in FS_ATTRIBUTE_INFORMATION. MacOS client show +"Format: SMB (Unknown)" on faked NTFS and no streams support. + +Cc: stable@vger.kernel.org +Reported-by: Miao Lihua <441884205@qq.com> +Tested-by: Miao Lihua <441884205@qq.com> +Signed-off-by: Namjae Jeon +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/ksmbd/smb2pdu.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/fs/ksmbd/smb2pdu.c ++++ b/fs/ksmbd/smb2pdu.c +@@ -4923,6 +4923,10 @@ static int smb2_get_info_filesystem(stru + + info->Attributes |= cpu_to_le32(server_conf.share_fake_fscaps); + ++ if (test_share_config_flag(work->tcon->share_conf, ++ KSMBD_SHARE_FLAG_STREAMS)) ++ info->Attributes |= cpu_to_le32(FILE_NAMED_STREAMS); ++ + info->MaxPathNameComponentLength = cpu_to_le32(stfs.f_namelen); + len = smbConvertToUTF16((__le16 *)info->FileSystemName, + "NTFS", PATH_MAX, conn->local_nls, 0); diff --git a/queue-5.15/nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch b/queue-5.15/nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch new file mode 100644 index 00000000000..12d6697de47 --- /dev/null +++ b/queue-5.15/nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch @@ -0,0 +1,86 @@ +From 003587000276f81d0114b5ce773d80c119d8cb30 Mon Sep 17 00:00:00 2001 +From: Ryusuke Konishi +Date: Tue, 7 Mar 2023 17:55:48 +0900 +Subject: nilfs2: fix kernel-infoleak in nilfs_ioctl_wrap_copy() + +From: Ryusuke Konishi + +commit 003587000276f81d0114b5ce773d80c119d8cb30 upstream. + +The ioctl helper function nilfs_ioctl_wrap_copy(), which exchanges a +metadata array to/from user space, may copy uninitialized buffer regions +to user space memory for read-only ioctl commands NILFS_IOCTL_GET_SUINFO +and NILFS_IOCTL_GET_CPINFO. + +This can occur when the element size of the user space metadata given by +the v_size member of the argument nilfs_argv structure is larger than the +size of the metadata element (nilfs_suinfo structure or nilfs_cpinfo +structure) on the file system side. + +KMSAN-enabled kernels detect this issue as follows: + + BUG: KMSAN: kernel-infoleak in instrument_copy_to_user + include/linux/instrumented.h:121 [inline] + BUG: KMSAN: kernel-infoleak in _copy_to_user+0xc0/0x100 lib/usercopy.c:33 + instrument_copy_to_user include/linux/instrumented.h:121 [inline] + _copy_to_user+0xc0/0x100 lib/usercopy.c:33 + copy_to_user include/linux/uaccess.h:169 [inline] + nilfs_ioctl_wrap_copy+0x6fa/0xc10 fs/nilfs2/ioctl.c:99 + nilfs_ioctl_get_info fs/nilfs2/ioctl.c:1173 [inline] + nilfs_ioctl+0x2402/0x4450 fs/nilfs2/ioctl.c:1290 + nilfs_compat_ioctl+0x1b8/0x200 fs/nilfs2/ioctl.c:1343 + __do_compat_sys_ioctl fs/ioctl.c:968 [inline] + __se_compat_sys_ioctl+0x7dd/0x1000 fs/ioctl.c:910 + __ia32_compat_sys_ioctl+0x93/0xd0 fs/ioctl.c:910 + do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] + __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 + do_fast_syscall_32+0x37/0x80 arch/x86/entry/common.c:203 + do_SYSENTER_32+0x1f/0x30 arch/x86/entry/common.c:246 + entry_SYSENTER_compat_after_hwframe+0x70/0x82 + + Uninit was created at: + __alloc_pages+0x9f6/0xe90 mm/page_alloc.c:5572 + alloc_pages+0xab0/0xd80 mm/mempolicy.c:2287 + __get_free_pages+0x34/0xc0 mm/page_alloc.c:5599 + nilfs_ioctl_wrap_copy+0x223/0xc10 fs/nilfs2/ioctl.c:74 + nilfs_ioctl_get_info fs/nilfs2/ioctl.c:1173 [inline] + nilfs_ioctl+0x2402/0x4450 fs/nilfs2/ioctl.c:1290 + nilfs_compat_ioctl+0x1b8/0x200 fs/nilfs2/ioctl.c:1343 + __do_compat_sys_ioctl fs/ioctl.c:968 [inline] + __se_compat_sys_ioctl+0x7dd/0x1000 fs/ioctl.c:910 + __ia32_compat_sys_ioctl+0x93/0xd0 fs/ioctl.c:910 + do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] + __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 + do_fast_syscall_32+0x37/0x80 arch/x86/entry/common.c:203 + do_SYSENTER_32+0x1f/0x30 arch/x86/entry/common.c:246 + entry_SYSENTER_compat_after_hwframe+0x70/0x82 + + Bytes 16-127 of 3968 are uninitialized + ... + +This eliminates the leak issue by initializing the page allocated as +buffer using get_zeroed_page(). + +Link: https://lkml.kernel.org/r/20230307085548.6290-1-konishi.ryusuke@gmail.com +Signed-off-by: Ryusuke Konishi +Reported-by: syzbot+132fdd2f1e1805fdc591@syzkaller.appspotmail.com + Link: https://lkml.kernel.org/r/000000000000a5bd2d05f63f04ae@google.com +Tested-by: Ryusuke Konishi +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/nilfs2/ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/nilfs2/ioctl.c ++++ b/fs/nilfs2/ioctl.c +@@ -71,7 +71,7 @@ static int nilfs_ioctl_wrap_copy(struct + if (argv->v_index > ~(__u64)0 - argv->v_nmembs) + return -EINVAL; + +- buf = (void *)__get_free_pages(GFP_NOFS, 0); ++ buf = (void *)get_zeroed_page(GFP_NOFS); + if (unlikely(!buf)) + return -ENOMEM; + maxmembs = PAGE_SIZE / argv->v_size; diff --git a/queue-5.15/series b/queue-5.15/series index e5f30cba95d..76ceb6c325f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -121,3 +121,8 @@ usb-chipidea-core-fix-possible-concurrent-when-switch-role.patch usb-ucsi-fix-null-pointer-deref-in-ucsi_connector_change.patch kfence-avoid-passing-g-for-test.patch kvm-x86-hyper-v-avoid-calling-kvm_make_vcpus_request_mask-with-vcpu_mask-null.patch +ksmbd-set-file_named_streams-attribute-in-fs_attribute_information.patch +ksmbd-return-status_not_supported-on-unsupported-smb2.0-dialect.patch +ksmbd-return-unsupported-error-on-smb1-mount.patch +wifi-mac80211-fix-qos-on-mesh-interfaces.patch +nilfs2-fix-kernel-infoleak-in-nilfs_ioctl_wrap_copy.patch diff --git a/queue-5.15/wifi-mac80211-fix-qos-on-mesh-interfaces.patch b/queue-5.15/wifi-mac80211-fix-qos-on-mesh-interfaces.patch new file mode 100644 index 00000000000..02a522a16c9 --- /dev/null +++ b/queue-5.15/wifi-mac80211-fix-qos-on-mesh-interfaces.patch @@ -0,0 +1,43 @@ +From 4e348c6c6e23491ae6eb5e077848a42d0562339c Mon Sep 17 00:00:00 2001 +From: Felix Fietkau +Date: Tue, 14 Mar 2023 10:59:50 +0100 +Subject: wifi: mac80211: fix qos on mesh interfaces + +From: Felix Fietkau + +commit 4e348c6c6e23491ae6eb5e077848a42d0562339c upstream. + +When ieee80211_select_queue is called for mesh, the sta pointer is usually +NULL, since the nexthop is looked up much later in the tx path. +Explicitly check for unicast address in that case in order to make qos work +again. + +Cc: stable@vger.kernel.org +Fixes: 50e2ab392919 ("wifi: mac80211: fix queue selection for mesh/OCB interfaces") +Signed-off-by: Felix Fietkau +Link: https://lore.kernel.org/r/20230314095956.62085-1-nbd@nbd.name +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/wme.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/net/mac80211/wme.c ++++ b/net/mac80211/wme.c +@@ -143,12 +143,14 @@ u16 ieee80211_select_queue_80211(struct + u16 __ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, struct sk_buff *skb) + { ++ const struct ethhdr *eth = (void *)skb->data; + struct mac80211_qos_map *qos_map; + bool qos; + + /* all mesh/ocb stations are required to support WME */ +- if (sta && (sdata->vif.type == NL80211_IFTYPE_MESH_POINT || +- sdata->vif.type == NL80211_IFTYPE_OCB)) ++ if ((sdata->vif.type == NL80211_IFTYPE_MESH_POINT && ++ !is_multicast_ether_addr(eth->h_dest)) || ++ (sdata->vif.type == NL80211_IFTYPE_OCB && sta)) + qos = true; + else if (sta) + qos = sta->sta.wme; -- 2.47.3