]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.11-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 18:27:40 +0000 (20:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 18:27:40 +0000 (20:27 +0200)
added patches:
alsa-hda-conexant-fix-audio-routing-for-hp-eliteone-1000-g2.patch
alsa-scarlett2-add-error-check-after-retrieving-peq-filter-values.patch
btrfs-fix-uninitialized-pointer-free-in-add_inode_ref.patch
btrfs-fix-uninitialized-pointer-free-on-read_alloc_one_name-error.patch
ksmbd-fix-user-after-free-from-session-log-off.patch
mptcp-pm-fix-uaf-read-in-mptcp_pm_nl_rm_addr_or_subflow.patch

queue-6.11/alsa-hda-conexant-fix-audio-routing-for-hp-eliteone-1000-g2.patch [new file with mode: 0644]
queue-6.11/alsa-scarlett2-add-error-check-after-retrieving-peq-filter-values.patch [new file with mode: 0644]
queue-6.11/btrfs-fix-uninitialized-pointer-free-in-add_inode_ref.patch [new file with mode: 0644]
queue-6.11/btrfs-fix-uninitialized-pointer-free-on-read_alloc_one_name-error.patch [new file with mode: 0644]
queue-6.11/ksmbd-fix-user-after-free-from-session-log-off.patch [new file with mode: 0644]
queue-6.11/mptcp-pm-fix-uaf-read-in-mptcp_pm_nl_rm_addr_or_subflow.patch [new file with mode: 0644]
queue-6.11/series

diff --git a/queue-6.11/alsa-hda-conexant-fix-audio-routing-for-hp-eliteone-1000-g2.patch b/queue-6.11/alsa-hda-conexant-fix-audio-routing-for-hp-eliteone-1000-g2.patch
new file mode 100644 (file)
index 0000000..77a9c09
--- /dev/null
@@ -0,0 +1,81 @@
+From 9988844c457f6f17fb2e75aa000b6c3b1b673bb9 Mon Sep 17 00:00:00 2001
+From: Vasiliy Kovalev <kovalev@altlinux.org>
+Date: Wed, 9 Oct 2024 16:42:48 +0300
+Subject: ALSA: hda/conexant - Fix audio routing for HP EliteOne 1000 G2
+
+From: Vasiliy Kovalev <kovalev@altlinux.org>
+
+commit 9988844c457f6f17fb2e75aa000b6c3b1b673bb9 upstream.
+
+There is a problem with simultaneous audio output to headphones and
+speakers, and when headphones are turned off, the speakers also turn
+off and do not turn them on.
+
+However, it was found that if you boot linux immediately after windows,
+there are no such problems. When comparing alsa-info, the only difference
+is the different configuration of Node 0x1d:
+
+working conf. (windows): Pin-ctls: 0x80: HP
+not working     (linux): Pin-ctls: 0xc0: OUT HP
+
+This patch disable the AC_PINCTL_OUT_EN bit of Node 0x1d and fixes the
+described problem.
+
+Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20241009134248.662175-1-kovalev@altlinux.org
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_conexant.c |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -303,6 +303,7 @@ enum {
+       CXT_FIXUP_HP_SPECTRE,
+       CXT_FIXUP_HP_GATE_MIC,
+       CXT_FIXUP_MUTE_LED_GPIO,
++      CXT_FIXUP_HP_ELITEONE_OUT_DIS,
+       CXT_FIXUP_HP_ZBOOK_MUTE_LED,
+       CXT_FIXUP_HEADSET_MIC,
+       CXT_FIXUP_HP_MIC_NO_PRESENCE,
+@@ -320,6 +321,19 @@ static void cxt_fixup_stereo_dmic(struct
+       spec->gen.inv_dmic_split = 1;
+ }
++/* fix widget control pin settings */
++static void cxt_fixup_update_pinctl(struct hda_codec *codec,
++                                 const struct hda_fixup *fix, int action)
++{
++      if (action == HDA_FIXUP_ACT_PROBE) {
++              /* Unset OUT_EN for this Node pin, leaving only HP_EN.
++               * This is the value stored in the codec register after
++               * the correct initialization of the previous windows boot.
++               */
++              snd_hda_set_pin_ctl(codec, 0x1d, AC_PINCTL_HP_EN);
++      }
++}
++
+ static void cxt5066_increase_mic_boost(struct hda_codec *codec,
+                                  const struct hda_fixup *fix, int action)
+ {
+@@ -971,6 +985,10 @@ static const struct hda_fixup cxt_fixups
+               .type = HDA_FIXUP_FUNC,
+               .v.func = cxt_fixup_mute_led_gpio,
+       },
++      [CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
++              .type = HDA_FIXUP_FUNC,
++              .v.func = cxt_fixup_update_pinctl,
++      },
+       [CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = cxt_fixup_hp_zbook_mute_led,
+@@ -1061,6 +1079,7 @@ static const struct snd_pci_quirk cxt506
+       SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),
+       SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
+       SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
++      SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
+       SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
+       SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
+       SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
diff --git a/queue-6.11/alsa-scarlett2-add-error-check-after-retrieving-peq-filter-values.patch b/queue-6.11/alsa-scarlett2-add-error-check-after-retrieving-peq-filter-values.patch
new file mode 100644 (file)
index 0000000..7144c0e
--- /dev/null
@@ -0,0 +1,39 @@
+From fd5f14c126a65f27ada3f192b982c6797cc302c7 Mon Sep 17 00:00:00 2001
+From: Zhu Jun <zhujun2@cmss.chinamobile.com>
+Date: Wed, 9 Oct 2024 02:23:05 -0700
+Subject: ALSA: scarlett2: Add error check after retrieving PEQ filter values
+
+From: Zhu Jun <zhujun2@cmss.chinamobile.com>
+
+commit fd5f14c126a65f27ada3f192b982c6797cc302c7 upstream.
+
+Add error check after retrieving PEQ filter values in
+scarlett2_update_filter_values that ensure function returns error if
+PEQ filter value retrieval fails.
+
+Fixes: b64678eb4e70 ("ALSA: scarlett2: Add DSP controls")
+Signed-off-by: Zhu Jun <zhujun2@cmss.chinamobile.com>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20241009092305.8570-1-zhujun2@cmss.chinamobile.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/mixer_scarlett2.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
+index 1150cf104985..4cddf84db631 100644
+--- a/sound/usb/mixer_scarlett2.c
++++ b/sound/usb/mixer_scarlett2.c
+@@ -5613,6 +5613,8 @@ static int scarlett2_update_filter_values(struct usb_mixer_interface *mixer)
+                       info->peq_flt_total_count *
+                       SCARLETT2_BIQUAD_COEFFS,
+               peq_flt_values);
++      if (err < 0)
++              return err;
+       for (i = 0, dst_idx = 0; i < info->dsp_input_count; i++) {
+               src_idx = i *
+-- 
+2.47.0
+
diff --git a/queue-6.11/btrfs-fix-uninitialized-pointer-free-in-add_inode_ref.patch b/queue-6.11/btrfs-fix-uninitialized-pointer-free-in-add_inode_ref.patch
new file mode 100644 (file)
index 0000000..e314799
--- /dev/null
@@ -0,0 +1,55 @@
+From 66691c6e2f18d2aa4b22ffb624b9bdc97e9979e4 Mon Sep 17 00:00:00 2001
+From: Roi Martin <jroi.martin@gmail.com>
+Date: Wed, 9 Oct 2024 10:08:33 +0200
+Subject: btrfs: fix uninitialized pointer free in add_inode_ref()
+
+From: Roi Martin <jroi.martin@gmail.com>
+
+commit 66691c6e2f18d2aa4b22ffb624b9bdc97e9979e4 upstream.
+
+The add_inode_ref() function does not initialize the "name" struct when
+it is declared.  If any of the following calls to "read_one_inode()
+returns NULL,
+
+       dir = read_one_inode(root, parent_objectid);
+       if (!dir) {
+               ret = -ENOENT;
+               goto out;
+       }
+
+       inode = read_one_inode(root, inode_objectid);
+       if (!inode) {
+               ret = -EIO;
+               goto out;
+       }
+
+then "name.name" would be freed on "out" before being initialized.
+
+out:
+       ...
+       kfree(name.name);
+
+This issue was reported by Coverity with CID 1526744.
+
+Fixes: e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
+CC: stable@vger.kernel.org # 6.6+
+Reviewed-by: Filipe Manana <fdmanana@suse.com>
+Signed-off-by: Roi Martin <jroi.martin@gmail.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/tree-log.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/btrfs/tree-log.c
++++ b/fs/btrfs/tree-log.c
+@@ -1374,7 +1374,7 @@ static noinline int add_inode_ref(struct
+       struct inode *inode = NULL;
+       unsigned long ref_ptr;
+       unsigned long ref_end;
+-      struct fscrypt_str name;
++      struct fscrypt_str name = { 0 };
+       int ret;
+       int log_ref_ver = 0;
+       u64 parent_objectid;
diff --git a/queue-6.11/btrfs-fix-uninitialized-pointer-free-on-read_alloc_one_name-error.patch b/queue-6.11/btrfs-fix-uninitialized-pointer-free-on-read_alloc_one_name-error.patch
new file mode 100644 (file)
index 0000000..5a110db
--- /dev/null
@@ -0,0 +1,49 @@
+From 2ab5e243c2266c841e0f6904fad1514b18eaf510 Mon Sep 17 00:00:00 2001
+From: Roi Martin <jroi.martin@gmail.com>
+Date: Thu, 10 Oct 2024 21:47:17 +0200
+Subject: btrfs: fix uninitialized pointer free on read_alloc_one_name() error
+
+From: Roi Martin <jroi.martin@gmail.com>
+
+commit 2ab5e243c2266c841e0f6904fad1514b18eaf510 upstream.
+
+The function read_alloc_one_name() does not initialize the name field of
+the passed fscrypt_str struct if kmalloc fails to allocate the
+corresponding buffer.  Thus, it is not guaranteed that
+fscrypt_str.name is initialized when freeing it.
+
+This is a follow-up to the linked patch that fixes the remaining
+instances of the bug introduced by commit e43eec81c516 ("btrfs: use
+struct qstr instead of name and namelen pairs").
+
+Link: https://lore.kernel.org/linux-btrfs/20241009080833.1355894-1-jroi.martin@gmail.com/
+Fixes: e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
+CC: stable@vger.kernel.org # 6.1+
+Reviewed-by: Anand Jain <anand.jain@oracle.com>
+Signed-off-by: Roi Martin <jroi.martin@gmail.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/tree-log.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/btrfs/tree-log.c
++++ b/fs/btrfs/tree-log.c
+@@ -1845,7 +1845,7 @@ static noinline int replay_one_name(stru
+                                   struct btrfs_dir_item *di,
+                                   struct btrfs_key *key)
+ {
+-      struct fscrypt_str name;
++      struct fscrypt_str name = { 0 };
+       struct btrfs_dir_item *dir_dst_di;
+       struct btrfs_dir_item *index_dst_di;
+       bool dir_dst_matches = false;
+@@ -2125,7 +2125,7 @@ static noinline int check_item_in_log(st
+       struct extent_buffer *eb;
+       int slot;
+       struct btrfs_dir_item *di;
+-      struct fscrypt_str name;
++      struct fscrypt_str name = { 0 };
+       struct inode *inode = NULL;
+       struct btrfs_key location;
diff --git a/queue-6.11/ksmbd-fix-user-after-free-from-session-log-off.patch b/queue-6.11/ksmbd-fix-user-after-free-from-session-log-off.patch
new file mode 100644 (file)
index 0000000..4e86c07
--- /dev/null
@@ -0,0 +1,151 @@
+From 7aa8804c0b67b3cb263a472d17f2cb50d7f1a930 Mon Sep 17 00:00:00 2001
+From: Namjae Jeon <linkinjeon@kernel.org>
+Date: Tue, 8 Oct 2024 22:42:57 +0900
+Subject: ksmbd: fix user-after-free from session log off
+
+From: Namjae Jeon <linkinjeon@kernel.org>
+
+commit 7aa8804c0b67b3cb263a472d17f2cb50d7f1a930 upstream.
+
+There is racy issue between smb2 session log off and smb2 session setup.
+It will cause user-after-free from session log off.
+This add session_lock when setting SMB2_SESSION_EXPIRED and referece
+count to session struct not to free session while it is being used.
+
+Cc: stable@vger.kernel.org # v5.15+
+Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-25282
+Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/smb/server/mgmt/user_session.c |   26 +++++++++++++++++++++-----
+ fs/smb/server/mgmt/user_session.h |    4 ++++
+ fs/smb/server/server.c            |    2 ++
+ fs/smb/server/smb2pdu.c           |    8 +++++++-
+ 4 files changed, 34 insertions(+), 6 deletions(-)
+
+--- a/fs/smb/server/mgmt/user_session.c
++++ b/fs/smb/server/mgmt/user_session.c
+@@ -177,9 +177,10 @@ static void ksmbd_expire_session(struct
+       down_write(&conn->session_lock);
+       xa_for_each(&conn->sessions, id, sess) {
+-              if (sess->state != SMB2_SESSION_VALID ||
+-                  time_after(jiffies,
+-                             sess->last_active + SMB2_SESSION_TIMEOUT)) {
++              if (atomic_read(&sess->refcnt) == 0 &&
++                  (sess->state != SMB2_SESSION_VALID ||
++                   time_after(jiffies,
++                             sess->last_active + SMB2_SESSION_TIMEOUT))) {
+                       xa_erase(&conn->sessions, sess->id);
+                       hash_del(&sess->hlist);
+                       ksmbd_session_destroy(sess);
+@@ -269,8 +270,6 @@ struct ksmbd_session *ksmbd_session_look
+       down_read(&sessions_table_lock);
+       sess = __session_lookup(id);
+-      if (sess)
+-              sess->last_active = jiffies;
+       up_read(&sessions_table_lock);
+       return sess;
+@@ -289,6 +288,22 @@ struct ksmbd_session *ksmbd_session_look
+       return sess;
+ }
++void ksmbd_user_session_get(struct ksmbd_session *sess)
++{
++      atomic_inc(&sess->refcnt);
++}
++
++void ksmbd_user_session_put(struct ksmbd_session *sess)
++{
++      if (!sess)
++              return;
++
++      if (atomic_read(&sess->refcnt) <= 0)
++              WARN_ON(1);
++      else
++              atomic_dec(&sess->refcnt);
++}
++
+ struct preauth_session *ksmbd_preauth_session_alloc(struct ksmbd_conn *conn,
+                                                   u64 sess_id)
+ {
+@@ -393,6 +408,7 @@ static struct ksmbd_session *__session_c
+       xa_init(&sess->rpc_handle_list);
+       sess->sequence_number = 1;
+       rwlock_init(&sess->tree_conns_lock);
++      atomic_set(&sess->refcnt, 1);
+       ret = __init_smb2_session(sess);
+       if (ret)
+--- a/fs/smb/server/mgmt/user_session.h
++++ b/fs/smb/server/mgmt/user_session.h
+@@ -61,6 +61,8 @@ struct ksmbd_session {
+       struct ksmbd_file_table         file_table;
+       unsigned long                   last_active;
+       rwlock_t                        tree_conns_lock;
++
++      atomic_t                        refcnt;
+ };
+ static inline int test_session_flag(struct ksmbd_session *sess, int bit)
+@@ -104,4 +106,6 @@ void ksmbd_release_tree_conn_id(struct k
+ int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name);
+ void ksmbd_session_rpc_close(struct ksmbd_session *sess, int id);
+ int ksmbd_session_rpc_method(struct ksmbd_session *sess, int id);
++void ksmbd_user_session_get(struct ksmbd_session *sess);
++void ksmbd_user_session_put(struct ksmbd_session *sess);
+ #endif /* __USER_SESSION_MANAGEMENT_H__ */
+--- a/fs/smb/server/server.c
++++ b/fs/smb/server/server.c
+@@ -238,6 +238,8 @@ static void __handle_ksmbd_work(struct k
+       } while (is_chained == true);
+ send:
++      if (work->sess)
++              ksmbd_user_session_put(work->sess);
+       if (work->tcon)
+               ksmbd_tree_connect_put(work->tcon);
+       smb3_preauth_hash_rsp(work);
+--- a/fs/smb/server/smb2pdu.c
++++ b/fs/smb/server/smb2pdu.c
+@@ -605,8 +605,10 @@ int smb2_check_user_session(struct ksmbd
+       /* Check for validity of user session */
+       work->sess = ksmbd_session_lookup_all(conn, sess_id);
+-      if (work->sess)
++      if (work->sess) {
++              ksmbd_user_session_get(work->sess);
+               return 1;
++      }
+       ksmbd_debug(SMB, "Invalid user session, Uid %llu\n", sess_id);
+       return -ENOENT;
+ }
+@@ -1746,6 +1748,7 @@ int smb2_sess_setup(struct ksmbd_work *w
+               }
+               conn->binding = true;
++              ksmbd_user_session_get(sess);
+       } else if ((conn->dialect < SMB30_PROT_ID ||
+                   server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL) &&
+                  (req->Flags & SMB2_SESSION_REQ_FLAG_BINDING)) {
+@@ -1772,6 +1775,7 @@ int smb2_sess_setup(struct ksmbd_work *w
+               }
+               conn->binding = false;
++              ksmbd_user_session_get(sess);
+       }
+       work->sess = sess;
+@@ -2232,7 +2236,9 @@ int smb2_session_logoff(struct ksmbd_wor
+       }
+       ksmbd_destroy_file_table(&sess->file_table);
++      down_write(&conn->session_lock);
+       sess->state = SMB2_SESSION_EXPIRED;
++      up_write(&conn->session_lock);
+       ksmbd_free_user(sess->user);
+       sess->user = NULL;
diff --git a/queue-6.11/mptcp-pm-fix-uaf-read-in-mptcp_pm_nl_rm_addr_or_subflow.patch b/queue-6.11/mptcp-pm-fix-uaf-read-in-mptcp_pm_nl_rm_addr_or_subflow.patch
new file mode 100644 (file)
index 0000000..b900d8e
--- /dev/null
@@ -0,0 +1,257 @@
+From 7decd1f5904a489d3ccdcf131972f94645681689 Mon Sep 17 00:00:00 2001
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+Date: Tue, 15 Oct 2024 10:38:47 +0200
+Subject: mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow
+
+From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+
+commit 7decd1f5904a489d3ccdcf131972f94645681689 upstream.
+
+Syzkaller reported this splat:
+
+  ==================================================================
+  BUG: KASAN: slab-use-after-free in mptcp_pm_nl_rm_addr_or_subflow+0xb44/0xcc0 net/mptcp/pm_netlink.c:881
+  Read of size 4 at addr ffff8880569ac858 by task syz.1.2799/14662
+
+  CPU: 0 UID: 0 PID: 14662 Comm: syz.1.2799 Not tainted 6.12.0-rc2-syzkaller-00307-g36c254515dc6 #0
+  Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014
+  Call Trace:
+   <TASK>
+   __dump_stack lib/dump_stack.c:94 [inline]
+   dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120
+   print_address_description mm/kasan/report.c:377 [inline]
+   print_report+0xc3/0x620 mm/kasan/report.c:488
+   kasan_report+0xd9/0x110 mm/kasan/report.c:601
+   mptcp_pm_nl_rm_addr_or_subflow+0xb44/0xcc0 net/mptcp/pm_netlink.c:881
+   mptcp_pm_nl_rm_subflow_received net/mptcp/pm_netlink.c:914 [inline]
+   mptcp_nl_remove_id_zero_address+0x305/0x4a0 net/mptcp/pm_netlink.c:1572
+   mptcp_pm_nl_del_addr_doit+0x5c9/0x770 net/mptcp/pm_netlink.c:1603
+   genl_family_rcv_msg_doit+0x202/0x2f0 net/netlink/genetlink.c:1115
+   genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline]
+   genl_rcv_msg+0x565/0x800 net/netlink/genetlink.c:1210
+   netlink_rcv_skb+0x165/0x410 net/netlink/af_netlink.c:2551
+   genl_rcv+0x28/0x40 net/netlink/genetlink.c:1219
+   netlink_unicast_kernel net/netlink/af_netlink.c:1331 [inline]
+   netlink_unicast+0x53c/0x7f0 net/netlink/af_netlink.c:1357
+   netlink_sendmsg+0x8b8/0xd70 net/netlink/af_netlink.c:1901
+   sock_sendmsg_nosec net/socket.c:729 [inline]
+   __sock_sendmsg net/socket.c:744 [inline]
+   ____sys_sendmsg+0x9ae/0xb40 net/socket.c:2607
+   ___sys_sendmsg+0x135/0x1e0 net/socket.c:2661
+   __sys_sendmsg+0x117/0x1f0 net/socket.c:2690
+   do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline]
+   __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386
+   do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411
+   entry_SYSENTER_compat_after_hwframe+0x84/0x8e
+  RIP: 0023:0xf7fe4579
+  Code: b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 00 00 00 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d b4 26 00 00 00 00 8d b4 26 00 00 00 00
+  RSP: 002b:00000000f574556c EFLAGS: 00000296 ORIG_RAX: 0000000000000172
+  RAX: ffffffffffffffda RBX: 000000000000000b RCX: 0000000020000140
+  RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
+  RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000
+  R10: 0000000000000000 R11: 0000000000000296 R12: 0000000000000000
+  R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
+   </TASK>
+
+  Allocated by task 5387:
+   kasan_save_stack+0x33/0x60 mm/kasan/common.c:47
+   kasan_save_track+0x14/0x30 mm/kasan/common.c:68
+   poison_kmalloc_redzone mm/kasan/common.c:377 [inline]
+   __kasan_kmalloc+0xaa/0xb0 mm/kasan/common.c:394
+   kmalloc_noprof include/linux/slab.h:878 [inline]
+   kzalloc_noprof include/linux/slab.h:1014 [inline]
+   subflow_create_ctx+0x87/0x2a0 net/mptcp/subflow.c:1803
+   subflow_ulp_init+0xc3/0x4d0 net/mptcp/subflow.c:1956
+   __tcp_set_ulp net/ipv4/tcp_ulp.c:146 [inline]
+   tcp_set_ulp+0x326/0x7f0 net/ipv4/tcp_ulp.c:167
+   mptcp_subflow_create_socket+0x4ae/0x10a0 net/mptcp/subflow.c:1764
+   __mptcp_subflow_connect+0x3cc/0x1490 net/mptcp/subflow.c:1592
+   mptcp_pm_create_subflow_or_signal_addr+0xbda/0x23a0 net/mptcp/pm_netlink.c:642
+   mptcp_pm_nl_fully_established net/mptcp/pm_netlink.c:650 [inline]
+   mptcp_pm_nl_work+0x3a1/0x4f0 net/mptcp/pm_netlink.c:943
+   mptcp_worker+0x15a/0x1240 net/mptcp/protocol.c:2777
+   process_one_work+0x958/0x1b30 kernel/workqueue.c:3229
+   process_scheduled_works kernel/workqueue.c:3310 [inline]
+   worker_thread+0x6c8/0xf00 kernel/workqueue.c:3391
+   kthread+0x2c1/0x3a0 kernel/kthread.c:389
+   ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147
+   ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
+
+  Freed by task 113:
+   kasan_save_stack+0x33/0x60 mm/kasan/common.c:47
+   kasan_save_track+0x14/0x30 mm/kasan/common.c:68
+   kasan_save_free_info+0x3b/0x60 mm/kasan/generic.c:579
+   poison_slab_object mm/kasan/common.c:247 [inline]
+   __kasan_slab_free+0x51/0x70 mm/kasan/common.c:264
+   kasan_slab_free include/linux/kasan.h:230 [inline]
+   slab_free_hook mm/slub.c:2342 [inline]
+   slab_free mm/slub.c:4579 [inline]
+   kfree+0x14f/0x4b0 mm/slub.c:4727
+   kvfree+0x47/0x50 mm/util.c:701
+   kvfree_rcu_list+0xf5/0x2c0 kernel/rcu/tree.c:3423
+   kvfree_rcu_drain_ready kernel/rcu/tree.c:3563 [inline]
+   kfree_rcu_monitor+0x503/0x8b0 kernel/rcu/tree.c:3632
+   kfree_rcu_shrink_scan+0x245/0x3a0 kernel/rcu/tree.c:3966
+   do_shrink_slab+0x44f/0x11c0 mm/shrinker.c:435
+   shrink_slab+0x32b/0x12a0 mm/shrinker.c:662
+   shrink_one+0x47e/0x7b0 mm/vmscan.c:4818
+   shrink_many mm/vmscan.c:4879 [inline]
+   lru_gen_shrink_node mm/vmscan.c:4957 [inline]
+   shrink_node+0x2452/0x39d0 mm/vmscan.c:5937
+   kswapd_shrink_node mm/vmscan.c:6765 [inline]
+   balance_pgdat+0xc19/0x18f0 mm/vmscan.c:6957
+   kswapd+0x5ea/0xbf0 mm/vmscan.c:7226
+   kthread+0x2c1/0x3a0 kernel/kthread.c:389
+   ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147
+   ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
+
+  Last potentially related work creation:
+   kasan_save_stack+0x33/0x60 mm/kasan/common.c:47
+   __kasan_record_aux_stack+0xba/0xd0 mm/kasan/generic.c:541
+   kvfree_call_rcu+0x74/0xbe0 kernel/rcu/tree.c:3810
+   subflow_ulp_release+0x2ae/0x350 net/mptcp/subflow.c:2009
+   tcp_cleanup_ulp+0x7c/0x130 net/ipv4/tcp_ulp.c:124
+   tcp_v4_destroy_sock+0x1c5/0x6a0 net/ipv4/tcp_ipv4.c:2541
+   inet_csk_destroy_sock+0x1a3/0x440 net/ipv4/inet_connection_sock.c:1293
+   tcp_done+0x252/0x350 net/ipv4/tcp.c:4870
+   tcp_rcv_state_process+0x379b/0x4f30 net/ipv4/tcp_input.c:6933
+   tcp_v4_do_rcv+0x1ad/0xa90 net/ipv4/tcp_ipv4.c:1938
+   sk_backlog_rcv include/net/sock.h:1115 [inline]
+   __release_sock+0x31b/0x400 net/core/sock.c:3072
+   __tcp_close+0x4f3/0xff0 net/ipv4/tcp.c:3142
+   __mptcp_close_ssk+0x331/0x14d0 net/mptcp/protocol.c:2489
+   mptcp_close_ssk net/mptcp/protocol.c:2543 [inline]
+   mptcp_close_ssk+0x150/0x220 net/mptcp/protocol.c:2526
+   mptcp_pm_nl_rm_addr_or_subflow+0x2be/0xcc0 net/mptcp/pm_netlink.c:878
+   mptcp_pm_nl_rm_subflow_received net/mptcp/pm_netlink.c:914 [inline]
+   mptcp_nl_remove_id_zero_address+0x305/0x4a0 net/mptcp/pm_netlink.c:1572
+   mptcp_pm_nl_del_addr_doit+0x5c9/0x770 net/mptcp/pm_netlink.c:1603
+   genl_family_rcv_msg_doit+0x202/0x2f0 net/netlink/genetlink.c:1115
+   genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline]
+   genl_rcv_msg+0x565/0x800 net/netlink/genetlink.c:1210
+   netlink_rcv_skb+0x165/0x410 net/netlink/af_netlink.c:2551
+   genl_rcv+0x28/0x40 net/netlink/genetlink.c:1219
+   netlink_unicast_kernel net/netlink/af_netlink.c:1331 [inline]
+   netlink_unicast+0x53c/0x7f0 net/netlink/af_netlink.c:1357
+   netlink_sendmsg+0x8b8/0xd70 net/netlink/af_netlink.c:1901
+   sock_sendmsg_nosec net/socket.c:729 [inline]
+   __sock_sendmsg net/socket.c:744 [inline]
+   ____sys_sendmsg+0x9ae/0xb40 net/socket.c:2607
+   ___sys_sendmsg+0x135/0x1e0 net/socket.c:2661
+   __sys_sendmsg+0x117/0x1f0 net/socket.c:2690
+   do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline]
+   __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386
+   do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411
+   entry_SYSENTER_compat_after_hwframe+0x84/0x8e
+
+  The buggy address belongs to the object at ffff8880569ac800
+   which belongs to the cache kmalloc-512 of size 512
+  The buggy address is located 88 bytes inside of
+   freed 512-byte region [ffff8880569ac800, ffff8880569aca00)
+
+  The buggy address belongs to the physical page:
+  page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x569ac
+  head: order:2 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0
+  flags: 0x4fff00000000040(head|node=1|zone=1|lastcpupid=0x7ff)
+  page_type: f5(slab)
+  raw: 04fff00000000040 ffff88801ac42c80 dead000000000100 dead000000000122
+  raw: 0000000000000000 0000000080100010 00000001f5000000 0000000000000000
+  head: 04fff00000000040 ffff88801ac42c80 dead000000000100 dead000000000122
+  head: 0000000000000000 0000000080100010 00000001f5000000 0000000000000000
+  head: 04fff00000000002 ffffea00015a6b01 ffffffffffffffff 0000000000000000
+  head: 0000000000000004 0000000000000000 00000000ffffffff 0000000000000000
+  page dumped because: kasan: bad access detected
+  page_owner tracks the page as allocated
+  page last allocated via order 2, migratetype Unmovable, gfp_mask 0xd20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC), pid 10238, tgid 10238 (kworker/u32:6), ts 597403252405, free_ts 597177952947
+   set_page_owner include/linux/page_owner.h:32 [inline]
+   post_alloc_hook+0x2d1/0x350 mm/page_alloc.c:1537
+   prep_new_page mm/page_alloc.c:1545 [inline]
+   get_page_from_freelist+0x101e/0x3070 mm/page_alloc.c:3457
+   __alloc_pages_noprof+0x223/0x25a0 mm/page_alloc.c:4733
+   alloc_pages_mpol_noprof+0x2c9/0x610 mm/mempolicy.c:2265
+   alloc_slab_page mm/slub.c:2412 [inline]
+   allocate_slab mm/slub.c:2578 [inline]
+   new_slab+0x2ba/0x3f0 mm/slub.c:2631
+   ___slab_alloc+0xd1d/0x16f0 mm/slub.c:3818
+   __slab_alloc.constprop.0+0x56/0xb0 mm/slub.c:3908
+   __slab_alloc_node mm/slub.c:3961 [inline]
+   slab_alloc_node mm/slub.c:4122 [inline]
+   __kmalloc_cache_noprof+0x2c5/0x310 mm/slub.c:4290
+   kmalloc_noprof include/linux/slab.h:878 [inline]
+   kzalloc_noprof include/linux/slab.h:1014 [inline]
+   mld_add_delrec net/ipv6/mcast.c:743 [inline]
+   igmp6_leave_group net/ipv6/mcast.c:2625 [inline]
+   igmp6_group_dropped+0x4ab/0xe40 net/ipv6/mcast.c:723
+   __ipv6_dev_mc_dec+0x281/0x360 net/ipv6/mcast.c:979
+   addrconf_leave_solict net/ipv6/addrconf.c:2253 [inline]
+   __ipv6_ifa_notify+0x3f6/0xc30 net/ipv6/addrconf.c:6283
+   addrconf_ifdown.isra.0+0xef9/0x1a20 net/ipv6/addrconf.c:3982
+   addrconf_notify+0x220/0x19c0 net/ipv6/addrconf.c:3781
+   notifier_call_chain+0xb9/0x410 kernel/notifier.c:93
+   call_netdevice_notifiers_info+0xbe/0x140 net/core/dev.c:1996
+   call_netdevice_notifiers_extack net/core/dev.c:2034 [inline]
+   call_netdevice_notifiers net/core/dev.c:2048 [inline]
+   dev_close_many+0x333/0x6a0 net/core/dev.c:1589
+  page last free pid 13136 tgid 13136 stack trace:
+   reset_page_owner include/linux/page_owner.h:25 [inline]
+   free_pages_prepare mm/page_alloc.c:1108 [inline]
+   free_unref_page+0x5f4/0xdc0 mm/page_alloc.c:2638
+   stack_depot_save_flags+0x2da/0x900 lib/stackdepot.c:666
+   kasan_save_stack+0x42/0x60 mm/kasan/common.c:48
+   kasan_save_track+0x14/0x30 mm/kasan/common.c:68
+   unpoison_slab_object mm/kasan/common.c:319 [inline]
+   __kasan_slab_alloc+0x89/0x90 mm/kasan/common.c:345
+   kasan_slab_alloc include/linux/kasan.h:247 [inline]
+   slab_post_alloc_hook mm/slub.c:4085 [inline]
+   slab_alloc_node mm/slub.c:4134 [inline]
+   kmem_cache_alloc_noprof+0x121/0x2f0 mm/slub.c:4141
+   skb_clone+0x190/0x3f0 net/core/skbuff.c:2084
+   do_one_broadcast net/netlink/af_netlink.c:1462 [inline]
+   netlink_broadcast_filtered+0xb11/0xef0 net/netlink/af_netlink.c:1540
+   netlink_broadcast+0x39/0x50 net/netlink/af_netlink.c:1564
+   uevent_net_broadcast_untagged lib/kobject_uevent.c:331 [inline]
+   kobject_uevent_net_broadcast lib/kobject_uevent.c:410 [inline]
+   kobject_uevent_env+0xacd/0x1670 lib/kobject_uevent.c:608
+   device_del+0x623/0x9f0 drivers/base/core.c:3882
+   snd_card_disconnect.part.0+0x58a/0x7c0 sound/core/init.c:546
+   snd_card_disconnect+0x1f/0x30 sound/core/init.c:495
+   snd_usx2y_disconnect+0xe9/0x1f0 sound/usb/usx2y/usbusx2y.c:417
+   usb_unbind_interface+0x1e8/0x970 drivers/usb/core/driver.c:461
+   device_remove drivers/base/dd.c:569 [inline]
+   device_remove+0x122/0x170 drivers/base/dd.c:561
+
+That's because 'subflow' is used just after 'mptcp_close_ssk(subflow)',
+which will initiate the release of its memory. Even if it is very likely
+the release and the re-utilisation will be done later on, it is of
+course better to avoid any issues and read the content of 'subflow'
+before closing it.
+
+Fixes: 1c1f72137598 ("mptcp: pm: only decrement add_addr_accepted for MPJ req")
+Cc: stable@vger.kernel.org
+Reported-by: syzbot+3c8b7a8e7df6a2a226ca@syzkaller.appspotmail.com
+Closes: https://lore.kernel.org/670d7337.050a0220.4cbc0.004f.GAE@google.com
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Link: https://patch.msgid.link/20241015-net-mptcp-uaf-pm-rm-v1-1-c4ee5d987a64@kernel.org
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/mptcp/pm_netlink.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/mptcp/pm_netlink.c
++++ b/net/mptcp/pm_netlink.c
+@@ -869,12 +869,12 @@ static void mptcp_pm_nl_rm_addr_or_subfl
+                                i, rm_id, id, remote_id, msk->mpc_endpoint_id);
+                       spin_unlock_bh(&msk->pm.lock);
+                       mptcp_subflow_shutdown(sk, ssk, how);
++                      removed |= subflow->request_join;
+                       /* the following takes care of updating the subflows counter */
+                       mptcp_close_ssk(sk, ssk, subflow);
+                       spin_lock_bh(&msk->pm.lock);
+-                      removed |= subflow->request_join;
+                       if (rm_type == MPTCP_MIB_RMSUBFLOW)
+                               __MPTCP_INC_STATS(sock_net(sk), rm_type);
+               }
index ce7a3cc881dd2abf8097d6c1d24c6e246962f89a..02037dcdd0dea3dfb317e19c8a5fbcbcf5700f14 100644 (file)
@@ -1 +1,7 @@
 revert-mm-introduce-pf_memalloc_noreclaim-pf_memalloc_nowarn.patch
+btrfs-fix-uninitialized-pointer-free-in-add_inode_ref.patch
+btrfs-fix-uninitialized-pointer-free-on-read_alloc_one_name-error.patch
+ksmbd-fix-user-after-free-from-session-log-off.patch
+alsa-scarlett2-add-error-check-after-retrieving-peq-filter-values.patch
+alsa-hda-conexant-fix-audio-routing-for-hp-eliteone-1000-g2.patch
+mptcp-pm-fix-uaf-read-in-mptcp_pm_nl_rm_addr_or_subflow.patch