From: Sasha Levin Date: Wed, 10 Apr 2024 15:57:04 +0000 (-0400) Subject: Fixes for 5.15 X-Git-Tag: v4.19.312~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ab4a76b445ab68e6950ac5ca912705cb2b7740c;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/alsa-firewire-lib-handle-quirk-to-calculate-payload-.patch b/queue-5.15/alsa-firewire-lib-handle-quirk-to-calculate-payload-.patch new file mode 100644 index 0000000000..af5f2439fb --- /dev/null +++ b/queue-5.15/alsa-firewire-lib-handle-quirk-to-calculate-payload-.patch @@ -0,0 +1,72 @@ +From 618d5227f8a1fac4252782fbde8c3ef2de90050d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 18 Feb 2024 16:41:27 +0900 +Subject: ALSA: firewire-lib: handle quirk to calculate payload quadlets as + data block counter + +From: Takashi Sakamoto + +[ Upstream commit 4a486439d2ca85752c46711f373b6ddc107bb35d ] + +Miglia Harmony Audio (OXFW970) has a quirk to put the number of +accumulated quadlets in CIP payload into the dbc field of CIP header. + +This commit handles the quirk in the packet processing layer. + +Signed-off-by: Takashi Sakamoto +Link: https://lore.kernel.org/r/20240218074128.95210-4-o-takashi@sakamocchi.jp +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/firewire/amdtp-stream.c | 12 ++++++++---- + sound/firewire/amdtp-stream.h | 4 ++++ + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c +index f8b644cb9157a..8753125683692 100644 +--- a/sound/firewire/amdtp-stream.c ++++ b/sound/firewire/amdtp-stream.c +@@ -771,10 +771,14 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf, + } else { + unsigned int dbc_interval; + +- if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0) +- dbc_interval = s->ctx_data.tx.dbc_interval; +- else +- dbc_interval = *data_blocks; ++ if (!(s->flags & CIP_DBC_IS_PAYLOAD_QUADLETS)) { ++ if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0) ++ dbc_interval = s->ctx_data.tx.dbc_interval; ++ else ++ dbc_interval = *data_blocks; ++ } else { ++ dbc_interval = payload_length / sizeof(__be32); ++ } + + lost = dbc != ((*data_block_counter + dbc_interval) & 0xff); + } +diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h +index 1f957c946c956..cf9ab347277f2 100644 +--- a/sound/firewire/amdtp-stream.h ++++ b/sound/firewire/amdtp-stream.h +@@ -37,6 +37,9 @@ + * the value of current SYT_INTERVAL; e.g. initial value is not zero. + * @CIP_UNAWARE_SYT: For outgoing packet, the value in SYT field of CIP is 0xffff. + * For incoming packet, the value in SYT field of CIP is not handled. ++ * @CIP_DBC_IS_PAYLOAD_QUADLETS: Available for incoming packet, and only effective with ++ * CIP_DBC_IS_END_EVENT flag. The value of dbc field is the number of accumulated quadlets ++ * in CIP payload, instead of the number of accumulated data blocks. + */ + enum cip_flags { + CIP_NONBLOCKING = 0x00, +@@ -51,6 +54,7 @@ enum cip_flags { + CIP_NO_HEADER = 0x100, + CIP_UNALIGHED_DBC = 0x200, + CIP_UNAWARE_SYT = 0x400, ++ CIP_DBC_IS_PAYLOAD_QUADLETS = 0x800, + }; + + /** +-- +2.43.0 + diff --git a/queue-5.15/arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch b/queue-5.15/arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch new file mode 100644 index 0000000000..ff181cc451 --- /dev/null +++ b/queue-5.15/arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch @@ -0,0 +1,49 @@ +From b93530faebaab7e4ede2498664e613c6977b3e1a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 31 Jan 2024 22:17:08 +0100 +Subject: arm64: dts: rockchip: fix rk3328 hdmi ports node + +From: Johan Jonker + +[ Upstream commit 1d00ba4700d1e0f88ae70d028d2e17e39078fa1c ] + +Fix rk3328 hdmi ports node so that it matches the +rockchip,dw-hdmi.yaml binding. + +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/e5dea3b7-bf84-4474-9530-cc2da3c41104@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +index 3cbe83e6fb9a4..26f02cc70dc5d 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +@@ -728,11 +728,20 @@ hdmi: hdmi@ff3c0000 { + status = "disabled"; + + ports { +- hdmi_in: port { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hdmi_in: port@0 { ++ reg = <0>; ++ + hdmi_in_vop: endpoint { + remote-endpoint = <&vop_out_hdmi>; + }; + }; ++ ++ hdmi_out: port@1 { ++ reg = <1>; ++ }; + }; + }; + +-- +2.43.0 + diff --git a/queue-5.15/arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch b/queue-5.15/arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch new file mode 100644 index 0000000000..06aa586836 --- /dev/null +++ b/queue-5.15/arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch @@ -0,0 +1,65 @@ +From 61ce53c17fd0e14fc242a739a449eea8b1932de5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 31 Jan 2024 22:17:31 +0100 +Subject: arm64: dts: rockchip: fix rk3399 hdmi ports node + +From: Johan Jonker + +[ Upstream commit f051b6ace7ffcc48d6d1017191f167c0a85799f6 ] + +Fix rk3399 hdmi ports node so that it matches the +rockchip,dw-hdmi.yaml binding. + +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/a6ab6f75-3b80-40b1-bd30-3113e14becdd@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 9e33f0e6ed504..e98966899f53c 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -1801,6 +1801,7 @@ simple-audio-card,codec { + hdmi: hdmi@ff940000 { + compatible = "rockchip,rk3399-dw-hdmi"; + reg = <0x0 0xff940000 0x0 0x20000>; ++ reg-io-width = <4>; + interrupts = ; + clocks = <&cru PCLK_HDMI_CTRL>, + <&cru SCLK_HDMI_SFR>, +@@ -1809,13 +1810,16 @@ hdmi: hdmi@ff940000 { + <&cru PLL_VPLL>; + clock-names = "iahb", "isfr", "cec", "grf", "vpll"; + power-domains = <&power RK3399_PD_HDCP>; +- reg-io-width = <4>; + rockchip,grf = <&grf>; + #sound-dai-cells = <0>; + status = "disabled"; + + ports { +- hdmi_in: port { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hdmi_in: port@0 { ++ reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + +@@ -1828,6 +1832,10 @@ hdmi_in_vopl: endpoint@1 { + remote-endpoint = <&vopl_out_hdmi>; + }; + }; ++ ++ hdmi_out: port@1 { ++ reg = <1>; ++ }; + }; + }; + +-- +2.43.0 + diff --git a/queue-5.15/asoc-soc-core.c-skip-dummy-codec-when-adding-platfor.patch b/queue-5.15/asoc-soc-core.c-skip-dummy-codec-when-adding-platfor.patch new file mode 100644 index 0000000000..805b90471d --- /dev/null +++ b/queue-5.15/asoc-soc-core.c-skip-dummy-codec-when-adding-platfor.patch @@ -0,0 +1,42 @@ +From 849ed10b1bd62def81722cc1ccf5f9f547268342 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Mar 2024 15:56:06 +0900 +Subject: ASoC: soc-core.c: Skip dummy codec when adding platforms + +From: Chancel Liu + +[ Upstream commit 23fb6bc2696119391ec3a92ccaffe50e567c515e ] + +When pcm_runtime is adding platform components it will scan all +registered components. In case of DPCM FE/BE some DAI links will +configure dummy platform. However both dummy codec and dummy platform +are using "snd-soc-dummy" as component->name. Dummy codec should be +skipped when adding platforms otherwise there'll be overflow and UBSAN +complains. + +Reported-by: Zhipeng Wang +Signed-off-by: Chancel Liu +Link: https://msgid.link/r/20240305065606.3778642-1-chancel.liu@nxp.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/soc-core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c +index a5b3ee69fb886..1c4d8b96f77b1 100644 +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -1042,6 +1042,9 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, + if (!snd_soc_is_matching_component(platform, component)) + continue; + ++ if (snd_soc_component_is_dummy(component) && component->num_dai) ++ continue; ++ + snd_soc_rtd_add_component(rtd, component); + } + } +-- +2.43.0 + diff --git a/queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch new file mode 100644 index 0000000000..e69b5add4b --- /dev/null +++ b/queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch @@ -0,0 +1,71 @@ +From 87b80876fb3177052479756252638482fbaf8c81 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jan 2024 07:52:21 +0100 +Subject: batman-adv: Improve exception handling in batadv_throw_uevent() + +From: Markus Elfring + +[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ] + +The kfree() function was called in up to three cases by +the batadv_throw_uevent() function during error handling +even if the passed variable contained a null pointer. +This issue was detected by using the Coccinelle software. + +* Thus adjust jump targets. + +* Reorder kfree() calls at the end. + +Signed-off-by: Markus Elfring +Acked-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +--- + net/batman-adv/main.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c +index 5207cd8d6ad83..fba65c5c90bb9 100644 +--- a/net/batman-adv/main.c ++++ b/net/batman-adv/main.c +@@ -688,29 +688,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, + "%s%s", BATADV_UEV_TYPE_VAR, + batadv_uev_type_str[type]); + if (!uevent_env[0]) +- goto out; ++ goto report_error; + + uevent_env[1] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_ACTION_VAR, + batadv_uev_action_str[action]); + if (!uevent_env[1]) +- goto out; ++ goto free_first_env; + + /* If the event is DEL, ignore the data field */ + if (action != BATADV_UEV_DEL) { + uevent_env[2] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_DATA_VAR, data); + if (!uevent_env[2]) +- goto out; ++ goto free_second_env; + } + + ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); +-out: +- kfree(uevent_env[0]); +- kfree(uevent_env[1]); + kfree(uevent_env[2]); ++free_second_env: ++ kfree(uevent_env[1]); ++free_first_env: ++ kfree(uevent_env[0]); + + if (ret) ++report_error: + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", + batadv_uev_type_str[type], +-- +2.43.0 + diff --git a/queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch new file mode 100644 index 0000000000..cdce788cec --- /dev/null +++ b/queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch @@ -0,0 +1,55 @@ +From 429cc455122328225d271ae2cf8f610b0dcf95f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jan 2024 07:27:45 +0100 +Subject: batman-adv: Return directly after a failed + batadv_dat_select_candidates() in batadv_dat_forward_data() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Markus Elfring + +[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ] + +The kfree() function was called in one case by +the batadv_dat_forward_data() function during error handling +even if the passed variable contained a null pointer. +This issue was detected by using the Coccinelle software. + +* Thus return directly after a batadv_dat_select_candidates() call failed + at the beginning. + +* Delete the label “out” which became unnecessary with this refactoring. + +Signed-off-by: Markus Elfring +Acked-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +--- + net/batman-adv/distributed-arp-table.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c +index 42dcdf5fd76a1..c091b2a70d22d 100644 +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, + + cand = batadv_dat_select_candidates(bat_priv, ip, vid); + if (!cand) +- goto out; ++ return ret; + + batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); + +@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, + batadv_orig_node_put(cand[i].orig_node); + } + +-out: + kfree(cand); + return ret; + } +-- +2.43.0 + diff --git a/queue-5.15/block-prevent-division-by-zero-in-blk_rq_stat_sum.patch b/queue-5.15/block-prevent-division-by-zero-in-blk_rq_stat_sum.patch new file mode 100644 index 0000000000..5dcd02c2af --- /dev/null +++ b/queue-5.15/block-prevent-division-by-zero-in-blk_rq_stat_sum.patch @@ -0,0 +1,40 @@ +From e07b2de956bae2e5a7432f9bace249028cb84508 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Mar 2024 16:45:09 +0300 +Subject: block: prevent division by zero in blk_rq_stat_sum() + +From: Roman Smirnov + +[ Upstream commit 93f52fbeaf4b676b21acfe42a5152620e6770d02 ] + +The expression dst->nr_samples + src->nr_samples may +have zero value on overflow. It is necessary to add +a check to avoid division by zero. + +Found by Linux Verification Center (linuxtesting.org) with Svace. + +Signed-off-by: Roman Smirnov +Reviewed-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/20240305134509.23108-1-r.smirnov@omp.ru +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + block/blk-stat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/block/blk-stat.c b/block/blk-stat.c +index ae3dd1fb8e61d..6e602f9b966e4 100644 +--- a/block/blk-stat.c ++++ b/block/blk-stat.c +@@ -28,7 +28,7 @@ void blk_rq_stat_init(struct blk_rq_stat *stat) + /* src is a per-cpu stat, mean isn't initialized */ + void blk_rq_stat_sum(struct blk_rq_stat *dst, struct blk_rq_stat *src) + { +- if (!src->nr_samples) ++ if (dst->nr_samples + src->nr_samples <= dst->nr_samples) + return; + + dst->min = min(dst->min, src->min); +-- +2.43.0 + diff --git a/queue-5.15/bluetooth-btintel-fix-null-ptr-deref-in-btintel_read.patch b/queue-5.15/bluetooth-btintel-fix-null-ptr-deref-in-btintel_read.patch new file mode 100644 index 0000000000..2ad909ae0a --- /dev/null +++ b/queue-5.15/bluetooth-btintel-fix-null-ptr-deref-in-btintel_read.patch @@ -0,0 +1,36 @@ +From 9f155229ea4331744e4f8de80cc6e87a4e9d0fbb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jan 2024 12:40:34 +0800 +Subject: Bluetooth: btintel: Fix null ptr deref in btintel_read_version + +From: Edward Adam Davis + +[ Upstream commit b79e040910101b020931ba0c9a6b77e81ab7f645 ] + +If hci_cmd_sync_complete() is triggered and skb is NULL, then +hdev->req_skb is NULL, which will cause this issue. + +Reported-and-tested-by: syzbot+830d9e3fa61968246abd@syzkaller.appspotmail.com +Signed-off-by: Edward Adam Davis +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btintel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c +index 2a4cc5d8c2d40..75623302d00e7 100644 +--- a/drivers/bluetooth/btintel.c ++++ b/drivers/bluetooth/btintel.c +@@ -405,7 +405,7 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver) + struct sk_buff *skb; + + skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT); +- if (IS_ERR(skb)) { ++ if (IS_ERR_OR_NULL(skb)) { + bt_dev_err(hdev, "Reading Intel version information failed (%ld)", + PTR_ERR(skb)); + return PTR_ERR(skb); +-- +2.43.0 + diff --git a/queue-5.15/btrfs-export-handle-invalid-inode-or-root-reference-.patch b/queue-5.15/btrfs-export-handle-invalid-inode-or-root-reference-.patch new file mode 100644 index 0000000000..04ae881ab1 --- /dev/null +++ b/queue-5.15/btrfs-export-handle-invalid-inode-or-root-reference-.patch @@ -0,0 +1,48 @@ +From b76765d691a79ce752f1ce2c6a2178ce44f18bb0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jan 2024 21:19:18 +0100 +Subject: btrfs: export: handle invalid inode or root reference in + btrfs_get_parent() + +From: David Sterba + +[ Upstream commit 26b66d1d366a375745755ca7365f67110bbf6bd5 ] + +The get_parent handler looks up a parent of a given dentry, this can be +either a subvolume or a directory. The search is set up with offset -1 +but it's never expected to find such item, as it would break allowed +range of inode number or a root id. This means it's a corruption (ext4 +also returns this error code). + +Reviewed-by: Josef Bacik +Reviewed-by: Anand Jain +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/export.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c +index fab7eb76e53b2..58b0f04d7123f 100644 +--- a/fs/btrfs/export.c ++++ b/fs/btrfs/export.c +@@ -161,8 +161,15 @@ struct dentry *btrfs_get_parent(struct dentry *child) + ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); + if (ret < 0) + goto fail; ++ if (ret == 0) { ++ /* ++ * Key with offset of -1 found, there would have to exist an ++ * inode with such number or a root with such id. ++ */ ++ ret = -EUCLEAN; ++ goto fail; ++ } + +- BUG_ON(ret == 0); /* Key with offset of -1 found */ + if (path->slots[0] == 0) { + ret = -ENOENT; + goto fail; +-- +2.43.0 + diff --git a/queue-5.15/btrfs-handle-chunk-tree-lookup-error-in-btrfs_reloca.patch b/queue-5.15/btrfs-handle-chunk-tree-lookup-error-in-btrfs_reloca.patch new file mode 100644 index 0000000000..6c954a2488 --- /dev/null +++ b/queue-5.15/btrfs-handle-chunk-tree-lookup-error-in-btrfs_reloca.patch @@ -0,0 +1,56 @@ +From 70cbde54000a94e84a699d940989e1cd8f72bdb3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Jan 2024 23:42:29 +0100 +Subject: btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() + +From: David Sterba + +[ Upstream commit 7411055db5ce64f836aaffd422396af0075fdc99 ] + +The unhandled case in btrfs_relocate_sys_chunks() loop is a corruption, +as it could be caused only by two impossible conditions: + +- at first the search key is set up to look for a chunk tree item, with + offset -1, this is an inexact search and the key->offset will contain + the correct offset upon a successful search, a valid chunk tree item + cannot have an offset -1 + +- after first successful search, the found_key corresponds to a chunk + item, the offset is decremented by 1 before the next loop, it's + impossible to find a chunk item there due to alignment and size + constraints + +Reviewed-by: Josef Bacik +Reviewed-by: Anand Jain +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/volumes.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c +index 1ce0fa487e5b2..36e77956c63fa 100644 +--- a/fs/btrfs/volumes.c ++++ b/fs/btrfs/volumes.c +@@ -3358,7 +3358,17 @@ static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info) + mutex_unlock(&fs_info->reclaim_bgs_lock); + goto error; + } +- BUG_ON(ret == 0); /* Corruption */ ++ if (ret == 0) { ++ /* ++ * On the first search we would find chunk tree with ++ * offset -1, which is not possible. On subsequent ++ * loops this would find an existing item on an invalid ++ * offset (one less than the previous one, wrong ++ * alignment and size). ++ */ ++ ret = -EUCLEAN; ++ goto error; ++ } + + ret = btrfs_previous_item(chunk_root, path, key.objectid, + key.type); +-- +2.43.0 + diff --git a/queue-5.15/btrfs-send-handle-path-ref-underflow-in-header-itera.patch b/queue-5.15/btrfs-send-handle-path-ref-underflow-in-header-itera.patch new file mode 100644 index 0000000000..d78b4e28cd --- /dev/null +++ b/queue-5.15/btrfs-send-handle-path-ref-underflow-in-header-itera.patch @@ -0,0 +1,43 @@ +From e12129979dea129e7f04a91533e4109b6cbbe40a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Feb 2024 22:47:13 +0100 +Subject: btrfs: send: handle path ref underflow in header iterate_inode_ref() + +From: David Sterba + +[ Upstream commit 3c6ee34c6f9cd12802326da26631232a61743501 ] + +Change BUG_ON to proper error handling if building the path buffer +fails. The pointers are not printed so we don't accidentally leak kernel +addresses. + +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/send.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c +index 9900f879fa346..f1ef176a64242 100644 +--- a/fs/btrfs/send.c ++++ b/fs/btrfs/send.c +@@ -976,7 +976,15 @@ static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path, + ret = PTR_ERR(start); + goto out; + } +- BUG_ON(start < p->buf); ++ if (unlikely(start < p->buf)) { ++ btrfs_err(root->fs_info, ++ "send: path ref buffer underflow for key (%llu %u %llu)", ++ found_key->objectid, ++ found_key->type, ++ found_key->offset); ++ ret = -EINVAL; ++ goto out; ++ } + } + p->start = start; + } else { +-- +2.43.0 + diff --git a/queue-5.15/cpuidle-avoid-potential-overflow-in-integer-multipli.patch b/queue-5.15/cpuidle-avoid-potential-overflow-in-integer-multipli.patch new file mode 100644 index 0000000000..e0c603d7f9 --- /dev/null +++ b/queue-5.15/cpuidle-avoid-potential-overflow-in-integer-multipli.patch @@ -0,0 +1,57 @@ +From 72a07253f065977f577587fa1257e4c5ff930701 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Dec 2023 11:14:42 +0800 +Subject: cpuidle: Avoid potential overflow in integer multiplication + +From: C Cheng + +[ Upstream commit 88390dd788db485912ee7f9a8d3d56fc5265d52f ] + +In detail: + +In C language, when you perform a multiplication operation, if +both operands are of int type, the multiplication operation is +performed on the int type, and then the result is converted to +the target type. This means that if the product of int type +multiplication exceeds the range that int type can represent, +an overflow will occur even if you store the result in a +variable of int64_t type. + +For a multiplication of two int values, it is better to use +mul_u32_u32() rather than s->exit_latency_ns = s->exit_latency * +NSEC_PER_USEC to avoid potential overflow happenning. + +Signed-off-by: C Cheng +Signed-off-by: Bo Ye +Reviewed-by: AngeloGioacchino Del Regno +[ rjw: New subject ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/cpuidle/driver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c +index f70aa17e2a8e0..c594e28adddf3 100644 +--- a/drivers/cpuidle/driver.c ++++ b/drivers/cpuidle/driver.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "cpuidle.h" + +@@ -185,7 +186,7 @@ static void __cpuidle_driver_init(struct cpuidle_driver *drv) + s->target_residency_ns = 0; + + if (s->exit_latency > 0) +- s->exit_latency_ns = s->exit_latency * NSEC_PER_USEC; ++ s->exit_latency_ns = mul_u32_u32(s->exit_latency, NSEC_PER_USEC); + else if (s->exit_latency_ns < 0) + s->exit_latency_ns = 0; + } +-- +2.43.0 + diff --git a/queue-5.15/drivers-nvme-add-quirks-for-device-126f-2262.patch b/queue-5.15/drivers-nvme-add-quirks-for-device-126f-2262.patch new file mode 100644 index 0000000000..c43984a072 --- /dev/null +++ b/queue-5.15/drivers-nvme-add-quirks-for-device-126f-2262.patch @@ -0,0 +1,52 @@ +From 40a7206b85e1e3168679421c45cb0322e6ec8bf7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 16 Mar 2024 03:27:49 +0800 +Subject: drivers/nvme: Add quirks for device 126f:2262 + +From: Jiawei Fu (iBug) + +[ Upstream commit e89086c43f0500bc7c4ce225495b73b8ce234c1f ] + +This commit adds NVME_QUIRK_NO_DEEPEST_PS and NVME_QUIRK_BOGUS_NID for +device [126f:2262], which appears to be a generic VID:PID pair used for +many SSDs based on the Silicon Motion SM2262/SM2262EN controller. + +Two of my SSDs with this VID:PID pair exhibit the same behavior: + + * They frequently have trouble exiting the deepest power state (5), + resulting in the entire disk unresponsive. + Verified by setting nvme_core.default_ps_max_latency_us=10000 and + observing them behaving normally. + * They produce all-zero nguid and eui64 with `nvme id-ns` command. + +The offending products are: + + * HP SSD EX950 1TB + * HIKVISION C2000Pro 2TB + +Signed-off-by: Jiawei Fu +Reviewed-by: Christoph Hellwig +Reviewed-by: Sagi Grimberg +Signed-off-by: Keith Busch +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index fd20f3fdb1592..7bb74112fef37 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -3339,6 +3339,9 @@ static const struct pci_device_id nvme_id_table[] = { + NVME_QUIRK_BOGUS_NID, }, + { PCI_VDEVICE(REDHAT, 0x0010), /* Qemu emulated controller */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, ++ { PCI_DEVICE(0x126f, 0x2262), /* Silicon Motion generic */ ++ .driver_data = NVME_QUIRK_NO_DEEPEST_PS | ++ NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x126f, 0x2263), /* Silicon Motion unidentified */ + .driver_data = NVME_QUIRK_NO_NS_DESC_LIST, }, + { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */ +-- +2.43.0 + diff --git a/queue-5.15/drm-amd-display-fix-nanosec-stat-overflow.patch b/queue-5.15/drm-amd-display-fix-nanosec-stat-overflow.patch new file mode 100644 index 0000000000..00f06d1383 --- /dev/null +++ b/queue-5.15/drm-amd-display-fix-nanosec-stat-overflow.patch @@ -0,0 +1,45 @@ +From e7cf3b2e904f46fc1f46c2afd9ee246750f88a9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Aug 2019 11:53:52 -0400 +Subject: drm/amd/display: Fix nanosec stat overflow + +From: Aric Cyr + +[ Upstream commit 14d68acfd04b39f34eea7bea65dda652e6db5bf6 ] + +[Why] +Nanosec stats can overflow on long running systems potentially causing +statistic logging issues. + +[How] +Use 64bit types for nanosec stats to ensure no overflow. + +Reviewed-by: Rodrigo Siqueira +Tested-by: Daniel Wheeler +Signed-off-by: Aric Cyr +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/modules/inc/mod_stats.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h b/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h +index 4220fd8fdd60c..54cd86060f4d6 100644 +--- a/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h ++++ b/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h +@@ -57,10 +57,10 @@ void mod_stats_update_event(struct mod_stats *mod_stats, + unsigned int length); + + void mod_stats_update_flip(struct mod_stats *mod_stats, +- unsigned long timestamp_in_ns); ++ unsigned long long timestamp_in_ns); + + void mod_stats_update_vupdate(struct mod_stats *mod_stats, +- unsigned long timestamp_in_ns); ++ unsigned long long timestamp_in_ns); + + void mod_stats_update_freesync(struct mod_stats *mod_stats, + unsigned int v_total_min, +-- +2.43.0 + diff --git a/queue-5.15/ext4-add-a-hint-for-block-bitmap-corrupt-state-in-mb.patch b/queue-5.15/ext4-add-a-hint-for-block-bitmap-corrupt-state-in-mb.patch new file mode 100644 index 0000000000..59f7d79c16 --- /dev/null +++ b/queue-5.15/ext4-add-a-hint-for-block-bitmap-corrupt-state-in-mb.patch @@ -0,0 +1,44 @@ +From be414445c4b586f871ce544630f6ad5e64627f54 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jan 2024 14:11:54 +0800 +Subject: ext4: add a hint for block bitmap corrupt state in mb_groups + +From: Zhang Yi + +[ Upstream commit 68ee261fb15457ecb17e3683cb4e6a4792ca5b71 ] + +If one group is marked as block bitmap corrupted, its free blocks cannot +be used and its free count is also deducted from the global +sbi->s_freeclusters_counter. User might be confused about the absent +free space because we can't query the information about corrupted block +groups except unreliable error messages in syslog. So add a hint to show +block bitmap corrupted groups in mb_groups. + +Signed-off-by: Zhang Yi +Reviewed-by: Jan Kara +Link: https://lore.kernel.org/r/20240119061154.1525781-1-yi.zhang@huaweicloud.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/mballoc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index d13d669f90fd5..8dba416aa6c1e 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -2950,7 +2950,10 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v) + for (i = 0; i <= 13; i++) + seq_printf(seq, " %-5u", i <= blocksize_bits + 1 ? + sg.info.bb_counters[i] : 0); +- seq_puts(seq, " ]\n"); ++ seq_puts(seq, " ]"); ++ if (EXT4_MB_GRP_BBITMAP_CORRUPT(&sg.info)) ++ seq_puts(seq, " Block bitmap corrupted!"); ++ seq_puts(seq, "\n"); + + return 0; + } +-- +2.43.0 + diff --git a/queue-5.15/ext4-forbid-commit-inconsistent-quota-data-when-erro.patch b/queue-5.15/ext4-forbid-commit-inconsistent-quota-data-when-erro.patch new file mode 100644 index 0000000000..d6dc38b566 --- /dev/null +++ b/queue-5.15/ext4-forbid-commit-inconsistent-quota-data-when-erro.patch @@ -0,0 +1,70 @@ +From 53e5a0f08ecd58ae29c152ba75335a2512e8ea6e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jan 2024 14:29:08 +0800 +Subject: ext4: forbid commit inconsistent quota data when errors=remount-ro + +From: Ye Bin + +[ Upstream commit d8b945fa475f13d787df00c26a6dc45a3e2e1d1d ] + +There's issue as follows When do IO fault injection test: +Quota error (device dm-3): find_block_dqentry: Quota for id 101 referenced but not present +Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 101 +Quota error (device dm-3): do_check_range: Getting block 2021161007 out of range 1-186 +Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 661 + +Now, ext4_write_dquot()/ext4_acquire_dquot()/ext4_release_dquot() may commit +inconsistent quota data even if process failed. This may lead to filesystem +corruption. +To ensure filesystem consistent when errors=remount-ro there is need to call +ext4_handle_error() to abort journal. + +Signed-off-by: Ye Bin +Reviewed-by: Jan Kara +Link: https://lore.kernel.org/r/20240119062908.3598806-1-yebin10@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/super.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 8b276b95a7904..b09b7a6b7a154 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -6170,6 +6170,10 @@ static int ext4_write_dquot(struct dquot *dquot) + if (IS_ERR(handle)) + return PTR_ERR(handle); + ret = dquot_commit(dquot); ++ if (ret < 0) ++ ext4_error_err(dquot->dq_sb, -ret, ++ "Failed to commit dquot type %d", ++ dquot->dq_id.type); + err = ext4_journal_stop(handle); + if (!ret) + ret = err; +@@ -6186,6 +6190,10 @@ static int ext4_acquire_dquot(struct dquot *dquot) + if (IS_ERR(handle)) + return PTR_ERR(handle); + ret = dquot_acquire(dquot); ++ if (ret < 0) ++ ext4_error_err(dquot->dq_sb, -ret, ++ "Failed to acquire dquot type %d", ++ dquot->dq_id.type); + err = ext4_journal_stop(handle); + if (!ret) + ret = err; +@@ -6205,6 +6213,10 @@ static int ext4_release_dquot(struct dquot *dquot) + return PTR_ERR(handle); + } + ret = dquot_release(dquot); ++ if (ret < 0) ++ ext4_error_err(dquot->dq_sb, -ret, ++ "Failed to release dquot type %d", ++ dquot->dq_id.type); + err = ext4_journal_stop(handle); + if (!ret) + ret = err; +-- +2.43.0 + diff --git a/queue-5.15/fbdev-viafb-fix-typo-in-hw_bitblt_1-and-hw_bitblt_2.patch b/queue-5.15/fbdev-viafb-fix-typo-in-hw_bitblt_1-and-hw_bitblt_2.patch new file mode 100644 index 0000000000..5592ddd0e8 --- /dev/null +++ b/queue-5.15/fbdev-viafb-fix-typo-in-hw_bitblt_1-and-hw_bitblt_2.patch @@ -0,0 +1,47 @@ +From aa2013db06e7ff2241d57be5ea3d8ff02064a67f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 1 Mar 2024 14:35:43 +0300 +Subject: fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2 + +From: Aleksandr Burakov + +[ Upstream commit bc87bb342f106a0402186bcb588fcbe945dced4b ] + +There are some actions with value 'tmp' but 'dst_addr' is checked instead. +It is obvious that a copy-paste error was made here and the value +of variable 'tmp' should be checked here. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Signed-off-by: Aleksandr Burakov +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/via/accel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/fbdev/via/accel.c b/drivers/video/fbdev/via/accel.c +index 0a1bc7a4d7853..1e04026f08091 100644 +--- a/drivers/video/fbdev/via/accel.c ++++ b/drivers/video/fbdev/via/accel.c +@@ -115,7 +115,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height, + + if (op != VIA_BITBLT_FILL) { + tmp = src_mem ? 0 : src_addr; +- if (dst_addr & 0xE0000007) { ++ if (tmp & 0xE0000007) { + printk(KERN_WARNING "hw_bitblt_1: Unsupported source " + "address %X\n", tmp); + return -EINVAL; +@@ -260,7 +260,7 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height, + writel(tmp, engine + 0x18); + + tmp = src_mem ? 0 : src_addr; +- if (dst_addr & 0xE0000007) { ++ if (tmp & 0xE0000007) { + printk(KERN_WARNING "hw_bitblt_2: Unsupported source " + "address %X\n", tmp); + return -EINVAL; +-- +2.43.0 + diff --git a/queue-5.15/fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch b/queue-5.15/fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch new file mode 100644 index 0000000000..5f4769aa74 --- /dev/null +++ b/queue-5.15/fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch @@ -0,0 +1,51 @@ +From 8f2e81d920263a4c6efe708b1c8550b1f4f54ac5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Mar 2024 11:13:44 +0300 +Subject: fbmon: prevent division by zero in fb_videomode_from_videomode() + +From: Roman Smirnov + +[ Upstream commit c2d953276b8b27459baed1277a4fdd5dd9bd4126 ] + +The expression htotal * vtotal can have a zero value on +overflow. It is necessary to prevent division by zero like in +fb_var_to_videomode(). + +Found by Linux Verification Center (linuxtesting.org) with Svace. + +Signed-off-by: Roman Smirnov +Reviewed-by: Sergey Shtylyov +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/core/fbmon.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c +index b0e690f41025a..9ca99da3a56a0 100644 +--- a/drivers/video/fbdev/core/fbmon.c ++++ b/drivers/video/fbdev/core/fbmon.c +@@ -1311,7 +1311,7 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf + int fb_videomode_from_videomode(const struct videomode *vm, + struct fb_videomode *fbmode) + { +- unsigned int htotal, vtotal; ++ unsigned int htotal, vtotal, total; + + fbmode->xres = vm->hactive; + fbmode->left_margin = vm->hback_porch; +@@ -1344,8 +1344,9 @@ int fb_videomode_from_videomode(const struct videomode *vm, + vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch + + vm->vsync_len; + /* prevent division by zero */ +- if (htotal && vtotal) { +- fbmode->refresh = vm->pixelclock / (htotal * vtotal); ++ total = htotal * vtotal; ++ if (total) { ++ fbmode->refresh = vm->pixelclock / total; + /* a mode must have htotal and vtotal != 0 or it is invalid */ + } else { + fbmode->refresh = 0; +-- +2.43.0 + diff --git a/queue-5.15/input-allocate-keycode-for-display-refresh-rate-togg.patch b/queue-5.15/input-allocate-keycode-for-display-refresh-rate-togg.patch new file mode 100644 index 0000000000..63e9adc23f --- /dev/null +++ b/queue-5.15/input-allocate-keycode-for-display-refresh-rate-togg.patch @@ -0,0 +1,43 @@ +From 3a34158e51eb8531335a6b6fe49408cb5a68e72b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Mar 2024 12:31:41 +0100 +Subject: Input: allocate keycode for Display refresh rate toggle +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gergo Koteles + +[ Upstream commit cfeb98b95fff25c442f78a6f616c627bc48a26b7 ] + +Newer Lenovo Yogas and Legions with 60Hz/90Hz displays send a wmi event +when Fn + R is pressed. This is intended for use to switch between the +two refresh rates. + +Allocate a new KEY_REFRESH_RATE_TOGGLE keycode for it. + +Signed-off-by: Gergo Koteles +Acked-by: Dmitry Torokhov +Link: https://lore.kernel.org/r/15a5d08c84cf4d7b820de34ebbcf8ae2502fb3ca.1710065750.git.soyer@irl.hu +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + include/uapi/linux/input-event-codes.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h +index 7989d9483ea75..bed20a89c14c1 100644 +--- a/include/uapi/linux/input-event-codes.h ++++ b/include/uapi/linux/input-event-codes.h +@@ -602,6 +602,7 @@ + + #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ + #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ ++#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ + + #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ + #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ +-- +2.43.0 + diff --git a/queue-5.15/input-synaptics-rmi4-fail-probing-if-memory-allocati.patch b/queue-5.15/input-synaptics-rmi4-fail-probing-if-memory-allocati.patch new file mode 100644 index 0000000000..f90c15f94c --- /dev/null +++ b/queue-5.15/input-synaptics-rmi4-fail-probing-if-memory-allocati.patch @@ -0,0 +1,42 @@ +From 0d0f02982168d9eed06b553040da634a8567c656 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jan 2024 11:37:59 -0800 +Subject: Input: synaptics-rmi4 - fail probing if memory allocation for "phys" + fails + +From: Kunwu Chan + +[ Upstream commit bc4996184d56cfaf56d3811ac2680c8a0e2af56e ] + +While input core can work with input->phys set to NULL userspace might +depend on it, so better fail probing if allocation fails. The system must +be in a pretty bad shape for it to happen anyway. + +Signed-off-by: Kunwu Chan +Link: https://lore.kernel.org/r/20240117073124.143636-1-chentao@kylinos.cn +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/rmi4/rmi_driver.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c +index 258d5fe3d395c..aa32371f04af6 100644 +--- a/drivers/input/rmi4/rmi_driver.c ++++ b/drivers/input/rmi4/rmi_driver.c +@@ -1196,7 +1196,11 @@ static int rmi_driver_probe(struct device *dev) + } + rmi_driver_set_input_params(rmi_dev, data->input); + data->input->phys = devm_kasprintf(dev, GFP_KERNEL, +- "%s/input0", dev_name(dev)); ++ "%s/input0", dev_name(dev)); ++ if (!data->input->phys) { ++ retval = -ENOMEM; ++ goto err; ++ } + } + + retval = rmi_init_functions(data); +-- +2.43.0 + diff --git a/queue-5.15/ionic-set-adminq-irq-affinity.patch b/queue-5.15/ionic-set-adminq-irq-affinity.patch new file mode 100644 index 0000000000..4cf8def635 --- /dev/null +++ b/queue-5.15/ionic-set-adminq-irq-affinity.patch @@ -0,0 +1,43 @@ +From 271cf750949336b8e8fbe0ea45642b4ab88af2f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 14 Feb 2024 09:59:01 -0800 +Subject: ionic: set adminq irq affinity + +From: Shannon Nelson + +[ Upstream commit c699f35d658f3c21b69ed24e64b2ea26381e941d ] + +We claim to have the AdminQ on our irq0 and thus cpu id 0, +but we need to be sure we set the affinity hint to try to +keep it there. + +Signed-off-by: Shannon Nelson +Reviewed-by: Brett Creeley +Reviewed-by: Jacob Keller +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +index 63181866809fd..1f84ba638e6eb 100644 +--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c ++++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +@@ -3232,9 +3232,12 @@ static int ionic_lif_adminq_init(struct ionic_lif *lif) + + napi_enable(&qcq->napi); + +- if (qcq->flags & IONIC_QCQ_F_INTR) ++ if (qcq->flags & IONIC_QCQ_F_INTR) { ++ irq_set_affinity_hint(qcq->intr.vector, ++ &qcq->intr.affinity_mask); + ionic_intr_mask(idev->intr_ctrl, qcq->intr.index, + IONIC_INTR_MASK_CLEAR); ++ } + + qcq->flags |= IONIC_QCQ_F_INITED; + +-- +2.43.0 + diff --git a/queue-5.15/isofs-handle-cds-with-bad-root-inode-but-good-joliet.patch b/queue-5.15/isofs-handle-cds-with-bad-root-inode-but-good-joliet.patch new file mode 100644 index 0000000000..0900b21dde --- /dev/null +++ b/queue-5.15/isofs-handle-cds-with-bad-root-inode-but-good-joliet.patch @@ -0,0 +1,60 @@ +From efb7cd944b099288927aa5746875956effe16154 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Feb 2024 19:21:32 -0700 +Subject: isofs: handle CDs with bad root inode but good Joliet root directory + +From: Alex Henrie + +[ Upstream commit 4243bf80c79211a8ca2795401add9c4a3b1d37ca ] + +I have a CD copy of the original Tom Clancy's Ghost Recon game from +2001. The disc mounts without error on Windows, but on Linux mounting +fails with the message "isofs_fill_super: get root inode failed". The +error originates in isofs_read_inode, which returns -EIO because de_len +is 0. The superblock on this disc appears to be intentionally corrupt as +a form of copy protection. + +When the root inode is unusable, instead of giving up immediately, try +to continue with the Joliet file table. This fixes the Ghost Recon CD +and probably other copy-protected CDs too. + +Signed-off-by: Alex Henrie +Signed-off-by: Jan Kara +Message-Id: <20240208022134.451490-1-alexhenrie24@gmail.com> +Signed-off-by: Sasha Levin +--- + fs/isofs/inode.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c +index 0c6eacfcbeef1..07252d2a7f5f2 100644 +--- a/fs/isofs/inode.c ++++ b/fs/isofs/inode.c +@@ -908,8 +908,22 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) + * we then decide whether to use the Joliet descriptor. + */ + inode = isofs_iget(s, sbi->s_firstdatazone, 0); +- if (IS_ERR(inode)) +- goto out_no_root; ++ ++ /* ++ * Fix for broken CDs with a corrupt root inode but a correct Joliet ++ * root directory. ++ */ ++ if (IS_ERR(inode)) { ++ if (joliet_level && sbi->s_firstdatazone != first_data_zone) { ++ printk(KERN_NOTICE ++ "ISOFS: root inode is unusable. " ++ "Disabling Rock Ridge and switching to Joliet."); ++ sbi->s_rock = 0; ++ inode = NULL; ++ } else { ++ goto out_no_root; ++ } ++ } + + /* + * Fix for broken CDs with Rock Ridge and empty ISO root directory but +-- +2.43.0 + diff --git a/queue-5.15/ktest-force-buildonly-1-for-make_warnings_file-test-.patch b/queue-5.15/ktest-force-buildonly-1-for-make_warnings_file-test-.patch new file mode 100644 index 0000000000..91bfb8f233 --- /dev/null +++ b/queue-5.15/ktest-force-buildonly-1-for-make_warnings_file-test-.patch @@ -0,0 +1,41 @@ +From f903f244a125489720650fd299ec465866865e73 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Mar 2024 12:28:08 -0300 +Subject: ktest: force $buildonly = 1 for 'make_warnings_file' test type + +From: Ricardo B. Marliere + +[ Upstream commit 07283c1873a4d0eaa0e822536881bfdaea853910 ] + +The test type "make_warnings_file" should have no mandatory configuration +parameters other than the ones required by the "build" test type, because +its purpose is to create a file with build warnings that may or may not be +used by other subsequent tests. Currently, the only way to use it as a +stand-alone test is by setting POWER_CYCLE, CONSOLE, SSH_USER, +BUILD_TARGET, TARGET_IMAGE, REBOOT_TYPE and GRUB_MENU. + +Link: https://lkml.kernel.org/r/20240315-ktest-v2-1-c5c20a75f6a3@marliere.net + +Cc: John Hawley +Signed-off-by: Ricardo B. Marliere +Signed-off-by: Steven Rostedt +Signed-off-by: Sasha Levin +--- + tools/testing/ktest/ktest.pl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl +index e6c381498e632..449e45bd69665 100755 +--- a/tools/testing/ktest/ktest.pl ++++ b/tools/testing/ktest/ktest.pl +@@ -836,6 +836,7 @@ sub set_value { + if ($lvalue =~ /^(TEST|BISECT|CONFIG_BISECT)_TYPE(\[.*\])?$/ && + $prvalue !~ /^(config_|)bisect$/ && + $prvalue !~ /^build$/ && ++ $prvalue !~ /^make_warnings_file$/ && + $buildonly) { + + # Note if a test is something other than build, then we +-- +2.43.0 + diff --git a/queue-5.15/libperf-evlist-avoid-out-of-bounds-access.patch b/queue-5.15/libperf-evlist-avoid-out-of-bounds-access.patch new file mode 100644 index 0000000000..a2976c7401 --- /dev/null +++ b/queue-5.15/libperf-evlist-avoid-out-of-bounds-access.patch @@ -0,0 +1,126 @@ +From ec62be8887a9d4f8c112bf77922258902d405d38 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 28 Feb 2024 23:07:57 -0800 +Subject: libperf evlist: Avoid out-of-bounds access + +From: Ian Rogers + +[ Upstream commit 1947b92464c3268381604bbe2ac977a3fd78192f ] + +Parallel testing appears to show a race between allocating and setting +evsel ids. As there is a bounds check on the xyarray it yields a segv +like: + +``` +AddressSanitizer:DEADLYSIGNAL + +================================================================= + +==484408==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000010 + +==484408==The signal is caused by a WRITE memory access. + +==484408==Hint: address points to the zero page. + + #0 0x55cef5d4eff4 in perf_evlist__id_hash tools/lib/perf/evlist.c:256 + #1 0x55cef5d4f132 in perf_evlist__id_add tools/lib/perf/evlist.c:274 + #2 0x55cef5d4f545 in perf_evlist__id_add_fd tools/lib/perf/evlist.c:315 + #3 0x55cef5a1923f in store_evsel_ids util/evsel.c:3130 + #4 0x55cef5a19400 in evsel__store_ids util/evsel.c:3147 + #5 0x55cef5888204 in __run_perf_stat tools/perf/builtin-stat.c:832 + #6 0x55cef5888c06 in run_perf_stat tools/perf/builtin-stat.c:960 + #7 0x55cef58932db in cmd_stat tools/perf/builtin-stat.c:2878 +... +``` + +Avoid this crash by early exiting the perf_evlist__id_add_fd and +perf_evlist__id_add is the access is out-of-bounds. + +Signed-off-by: Ian Rogers +Cc: Yang Jihong +Signed-off-by: Namhyung Kim +Link: https://lore.kernel.org/r/20240229070757.796244-1-irogers@google.com +Signed-off-by: Sasha Levin +--- + tools/lib/perf/evlist.c | 18 ++++++++++++------ + tools/lib/perf/include/internal/evlist.h | 4 ++-- + 2 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c +index 5146ff0fa078c..6aa1c35273a18 100644 +--- a/tools/lib/perf/evlist.c ++++ b/tools/lib/perf/evlist.c +@@ -224,10 +224,10 @@ u64 perf_evlist__read_format(struct perf_evlist *evlist) + + static void perf_evlist__id_hash(struct perf_evlist *evlist, + struct perf_evsel *evsel, +- int cpu, int thread, u64 id) ++ int cpu_map_idx, int thread, u64 id) + { + int hash; +- struct perf_sample_id *sid = SID(evsel, cpu, thread); ++ struct perf_sample_id *sid = SID(evsel, cpu_map_idx, thread); + + sid->id = id; + sid->evsel = evsel; +@@ -245,21 +245,27 @@ void perf_evlist__reset_id_hash(struct perf_evlist *evlist) + + void perf_evlist__id_add(struct perf_evlist *evlist, + struct perf_evsel *evsel, +- int cpu, int thread, u64 id) ++ int cpu_map_idx, int thread, u64 id) + { +- perf_evlist__id_hash(evlist, evsel, cpu, thread, id); ++ if (!SID(evsel, cpu_map_idx, thread)) ++ return; ++ ++ perf_evlist__id_hash(evlist, evsel, cpu_map_idx, thread, id); + evsel->id[evsel->ids++] = id; + } + + int perf_evlist__id_add_fd(struct perf_evlist *evlist, + struct perf_evsel *evsel, +- int cpu, int thread, int fd) ++ int cpu_map_idx, int thread, int fd) + { + u64 read_data[4] = { 0, }; + int id_idx = 1; /* The first entry is the counter value */ + u64 id; + int ret; + ++ if (!SID(evsel, cpu_map_idx, thread)) ++ return -1; ++ + ret = ioctl(fd, PERF_EVENT_IOC_ID, &id); + if (!ret) + goto add; +@@ -288,7 +294,7 @@ int perf_evlist__id_add_fd(struct perf_evlist *evlist, + id = read_data[id_idx]; + + add: +- perf_evlist__id_add(evlist, evsel, cpu, thread, id); ++ perf_evlist__id_add(evlist, evsel, cpu_map_idx, thread, id); + return 0; + } + +diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h +index f366dbad6a88c..49b17b2b3923f 100644 +--- a/tools/lib/perf/include/internal/evlist.h ++++ b/tools/lib/perf/include/internal/evlist.h +@@ -119,11 +119,11 @@ u64 perf_evlist__read_format(struct perf_evlist *evlist); + + void perf_evlist__id_add(struct perf_evlist *evlist, + struct perf_evsel *evsel, +- int cpu, int thread, u64 id); ++ int cpu_map_idx, int thread, u64 id); + + int perf_evlist__id_add_fd(struct perf_evlist *evlist, + struct perf_evsel *evsel, +- int cpu, int thread, int fd); ++ int cpu_map_idx, int thread, int fd); + + void perf_evlist__reset_id_hash(struct perf_evlist *evlist); + +-- +2.43.0 + diff --git a/queue-5.15/media-sta2x11-fix-irq-handler-cast.patch b/queue-5.15/media-sta2x11-fix-irq-handler-cast.patch new file mode 100644 index 0000000000..5e53556cdb --- /dev/null +++ b/queue-5.15/media-sta2x11-fix-irq-handler-cast.patch @@ -0,0 +1,62 @@ +From fa200bc13427b8ad8da5349d2d11976132d560f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Feb 2024 10:54:47 +0100 +Subject: media: sta2x11: fix irq handler cast + +From: Arnd Bergmann + +[ Upstream commit 3de49ae81c3a0f83a554ecbce4c08e019f30168e ] + +clang-16 warns about casting incompatible function pointers: + +drivers/media/pci/sta2x11/sta2x11_vip.c:1057:6: error: cast from 'irqreturn_t (*)(int, struct sta2x11_vip *)' (aka 'enum irqreturn (*)(int, struct sta2x11_vip *)') to 'irq_handler_t' (aka 'enum irqreturn (*)(int, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + +Change the prototype of the irq handler to the regular version with a +local variable to adjust the argument type. + +Signed-off-by: Arnd Bergmann +Signed-off-by: Hans Verkuil +[hverkuil: update argument documentation] +Signed-off-by: Sasha Levin +--- + drivers/media/pci/sta2x11/sta2x11_vip.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c +index 524912f20d9f2..74bbdc11abbb3 100644 +--- a/drivers/media/pci/sta2x11/sta2x11_vip.c ++++ b/drivers/media/pci/sta2x11/sta2x11_vip.c +@@ -760,7 +760,7 @@ static const struct video_device video_dev_template = { + /** + * vip_irq - interrupt routine + * @irq: Number of interrupt ( not used, correct number is assumed ) +- * @vip: local data structure containing all information ++ * @data: local data structure containing all information + * + * check for both frame interrupts set ( top and bottom ). + * check FIFO overflow, but limit number of log messages after open. +@@ -770,8 +770,9 @@ static const struct video_device video_dev_template = { + * + * IRQ_HANDLED, interrupt done. + */ +-static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip) ++static irqreturn_t vip_irq(int irq, void *data) + { ++ struct sta2x11_vip *vip = data; + unsigned int status; + + status = reg_read(vip, DVP_ITS); +@@ -1053,9 +1054,7 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev, + + spin_lock_init(&vip->slock); + +- ret = request_irq(pdev->irq, +- (irq_handler_t) vip_irq, +- IRQF_SHARED, KBUILD_MODNAME, vip); ++ ret = request_irq(pdev->irq, vip_irq, IRQF_SHARED, KBUILD_MODNAME, vip); + if (ret) { + dev_err(&pdev->dev, "request_irq failed\n"); + ret = -ENODEV; +-- +2.43.0 + diff --git a/queue-5.15/net-pcs-xpcs-return-einval-in-the-internal-methods.patch b/queue-5.15/net-pcs-xpcs-return-einval-in-the-internal-methods.patch new file mode 100644 index 0000000000..cb808715d5 --- /dev/null +++ b/queue-5.15/net-pcs-xpcs-return-einval-in-the-internal-methods.patch @@ -0,0 +1,51 @@ +From 519ea1e2e04cc92caa09ef0de7066809381dbe37 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Feb 2024 20:58:22 +0300 +Subject: net: pcs: xpcs: Return EINVAL in the internal methods + +From: Serge Semin + +[ Upstream commit f5151005d379d9ce42e327fd3b2d2aaef61cda81 ] + +In particular the xpcs_soft_reset() and xpcs_do_config() functions +currently return -1 if invalid auto-negotiation mode is specified. That +value might be then passed to the generic kernel subsystems which require +a standard kernel errno value. Even though the erroneous conditions are +very specific (memory corruption or buggy driver implementation) using a +hard-coded -1 literal doesn't seem correct anyway especially when it comes +to passing it higher to the network subsystem or printing to the system +log. Convert the hard-coded error values to -EINVAL then. + +Signed-off-by: Serge Semin +Tested-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/pcs/pcs-xpcs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c +index 556ca98843565..ab382496c3a83 100644 +--- a/drivers/net/pcs/pcs-xpcs.c ++++ b/drivers/net/pcs/pcs-xpcs.c +@@ -242,7 +242,7 @@ static int xpcs_soft_reset(struct dw_xpcs *xpcs, + dev = MDIO_MMD_VEND2; + break; + default: +- return -1; ++ return -EINVAL; + } + + ret = xpcs_write(xpcs, dev, MDIO_CTRL1, MDIO_CTRL1_RESET); +@@ -808,7 +808,7 @@ int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface, + return ret; + break; + default: +- return -1; ++ return -EINVAL; + } + + if (compat->pma_config) { +-- +2.43.0 + diff --git a/queue-5.15/net-smc-reduce-rtnl-pressure-in-smc_pnet_create_pnet.patch b/queue-5.15/net-smc-reduce-rtnl-pressure-in-smc_pnet_create_pnet.patch new file mode 100644 index 0000000000..62245d0df9 --- /dev/null +++ b/queue-5.15/net-smc-reduce-rtnl-pressure-in-smc_pnet_create_pnet.patch @@ -0,0 +1,96 @@ +From 010ed5b8cee2f65f533284a888a8982e4201e30e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 2 Mar 2024 10:07:44 +0000 +Subject: net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list() + +From: Eric Dumazet + +[ Upstream commit 00af2aa93b76b1bade471ad0d0525d4d29ca5cc0 ] + +Many syzbot reports show extreme rtnl pressure, and many of them hint +that smc acquires rtnl in netns creation for no good reason [1] + +This patch returns early from smc_pnet_net_init() +if there is no netdevice yet. + +I am not even sure why smc_pnet_create_pnetids_list() even exists, +because smc_pnet_netdev_event() is also calling +smc_pnet_add_base_pnetid() when handling NETDEV_UP event. + +[1] extract of typical syzbot reports + +2 locks held by syz-executor.3/12252: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.4/12253: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.1/12257: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.2/12261: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.0/12265: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.3/12268: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.4/12271: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.1/12274: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 +2 locks held by syz-executor.2/12280: + #0: ffffffff8f369610 (pernet_ops_rwsem){++++}-{3:3}, at: copy_net_ns+0x4c7/0x7b0 net/core/net_namespace.c:491 + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_create_pnetids_list net/smc/smc_pnet.c:809 [inline] + #1: ffffffff8f375b88 (rtnl_mutex){+.+.}-{3:3}, at: smc_pnet_net_init+0x10a/0x1e0 net/smc/smc_pnet.c:878 + +Signed-off-by: Eric Dumazet +Cc: Wenjia Zhang +Cc: Jan Karcher +Cc: "D. Wythe" +Cc: Tony Lu +Cc: Wen Gu +Reviewed-by: Wenjia Zhang +Link: https://lore.kernel.org/r/20240302100744.3868021-1-edumazet@google.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/smc/smc_pnet.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c +index 79ee0618d919b..c9e4b37e65777 100644 +--- a/net/smc/smc_pnet.c ++++ b/net/smc/smc_pnet.c +@@ -796,6 +796,16 @@ static void smc_pnet_create_pnetids_list(struct net *net) + u8 ndev_pnetid[SMC_MAX_PNETID_LEN]; + struct net_device *dev; + ++ /* Newly created netns do not have devices. ++ * Do not even acquire rtnl. ++ */ ++ if (list_empty(&net->dev_base_head)) ++ return; ++ ++ /* Note: This might not be needed, because smc_pnet_netdev_event() ++ * is also calling smc_pnet_add_base_pnetid() when handling ++ * NETDEV_UP event. ++ */ + rtnl_lock(); + for_each_netdev(net, dev) + smc_pnet_add_base_pnetid(net, dev, ndev_pnetid); +-- +2.43.0 + diff --git a/queue-5.15/netfilter-nf_tables-discard-table-flag-update-with-p.patch b/queue-5.15/netfilter-nf_tables-discard-table-flag-update-with-p.patch new file mode 100644 index 0000000000..fb53f11701 --- /dev/null +++ b/queue-5.15/netfilter-nf_tables-discard-table-flag-update-with-p.patch @@ -0,0 +1,63 @@ +From 57c38469e0ac722c9f3e0a7248b5b7497be12486 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 23:19:30 +0200 +Subject: netfilter: nf_tables: discard table flag update with pending + basechain deletion + +From: Pablo Neira Ayuso + +commit 1bc83a019bbe268be3526406245ec28c2458a518 upstream. + +Hook unregistration is deferred to the commit phase, same occurs with +hook updates triggered by the table dormant flag. When both commands are +combined, this results in deleting a basechain while leaving its hook +still registered in the core. + +Fixes: 179d9ba5559a ("netfilter: nf_tables: fix table flag updates") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_tables_api.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c +index ca061fc0b1def..113c1ebe4a5be 100644 +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -1139,6 +1139,24 @@ static void nf_tables_table_disable(struct net *net, struct nft_table *table) + #define __NFT_TABLE_F_UPDATE (__NFT_TABLE_F_WAS_DORMANT | \ + __NFT_TABLE_F_WAS_AWAKEN) + ++static bool nft_table_pending_update(const struct nft_ctx *ctx) ++{ ++ struct nftables_pernet *nft_net = nft_pernet(ctx->net); ++ struct nft_trans *trans; ++ ++ if (ctx->table->flags & __NFT_TABLE_F_UPDATE) ++ return true; ++ ++ list_for_each_entry(trans, &nft_net->commit_list, list) { ++ if (trans->ctx.table == ctx->table && ++ trans->msg_type == NFT_MSG_DELCHAIN && ++ nft_is_base_chain(trans->ctx.chain)) ++ return true; ++ } ++ ++ return false; ++} ++ + static int nf_tables_updtable(struct nft_ctx *ctx) + { + struct nft_trans *trans; +@@ -1162,7 +1180,7 @@ static int nf_tables_updtable(struct nft_ctx *ctx) + return -EOPNOTSUPP; + + /* No dormant off/on/off/on games in single transaction */ +- if (ctx->table->flags & __NFT_TABLE_F_UPDATE) ++ if (nft_table_pending_update(ctx)) + return -EINVAL; + + trans = nft_trans_alloc(ctx, NFT_MSG_NEWTABLE, +-- +2.43.0 + diff --git a/queue-5.15/netfilter-nf_tables-release-batch-on-table-validatio.patch b/queue-5.15/netfilter-nf_tables-release-batch-on-table-validatio.patch new file mode 100644 index 0000000000..8f46d9193c --- /dev/null +++ b/queue-5.15/netfilter-nf_tables-release-batch-on-table-validatio.patch @@ -0,0 +1,84 @@ +From 4721d9870ec844f985ec327d0e847e0fae2132ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 23:19:28 +0200 +Subject: netfilter: nf_tables: release batch on table validation from abort + path + +From: Pablo Neira Ayuso + +commit a45e6889575c2067d3c0212b6bc1022891e65b91 upstream. + +Unlike early commit path stage which triggers a call to abort, an +explicit release of the batch is required on abort, otherwise mutex is +released and commit_list remains in place. + +Add WARN_ON_ONCE to ensure commit_list is empty from the abort path +before releasing the mutex. + +After this patch, commit_list is always assumed to be empty before +grabbing the mutex, therefore + + 03c1f1ef1584 ("netfilter: Cleanup nft_net->module_list from nf_tables_exit_net()") + +only needs to release the pending modules for registration. + +Cc: stable@vger.kernel.org +Fixes: c0391b6ab810 ("netfilter: nf_tables: missing validation from the abort path") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_tables_api.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c +index 6f5a031d70e7f..9801bac049e28 100644 +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -9705,10 +9705,11 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) + struct nft_trans *trans, *next; + LIST_HEAD(set_update_list); + struct nft_trans_elem *te; ++ int err = 0; + + if (action == NFNL_ABORT_VALIDATE && + nf_tables_validate(net) < 0) +- return -EAGAIN; ++ err = -EAGAIN; + + list_for_each_entry_safe_reverse(trans, next, &nft_net->commit_list, + list) { +@@ -9884,7 +9885,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) + else + nf_tables_module_autoload_cleanup(net); + +- return 0; ++ return err; + } + + static int nf_tables_abort(struct net *net, struct sk_buff *skb, +@@ -9898,6 +9899,8 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, + ret = __nf_tables_abort(net, action); + nft_gc_seq_end(nft_net, gc_seq); + ++ WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); ++ + mutex_unlock(&nft_net->commit_mutex); + + return ret; +@@ -10695,9 +10698,10 @@ static void __net_exit nf_tables_exit_net(struct net *net) + + gc_seq = nft_gc_seq_begin(nft_net); + +- if (!list_empty(&nft_net->commit_list) || +- !list_empty(&nft_net->module_list)) +- __nf_tables_abort(net, NFNL_ABORT_NONE); ++ WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); ++ ++ if (!list_empty(&nft_net->module_list)) ++ nf_tables_module_autoload_cleanup(net); + + __nft_release_tables(net); + +-- +2.43.0 + diff --git a/queue-5.15/netfilter-nf_tables-release-mutex-after-nft_gc_seq_e.patch b/queue-5.15/netfilter-nf_tables-release-mutex-after-nft_gc_seq_e.patch new file mode 100644 index 0000000000..a0db7d3668 --- /dev/null +++ b/queue-5.15/netfilter-nf_tables-release-mutex-after-nft_gc_seq_e.patch @@ -0,0 +1,62 @@ +From 101ef824ad7d8e47dc230a6a53011149aa85753d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 23:19:29 +0200 +Subject: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort + path + +From: Pablo Neira Ayuso + +commit 0d459e2ffb541841714839e8228b845458ed3b27 upstream. + +The commit mutex should not be released during the critical section +between nft_gc_seq_begin() and nft_gc_seq_end(), otherwise, async GC +worker could collect expired objects and get the released commit lock +within the same GC sequence. + +nf_tables_module_autoload() temporarily releases the mutex to load +module dependencies, then it goes back to replay the transaction again. +Move it at the end of the abort phase after nft_gc_seq_end() is called. + +Cc: stable@vger.kernel.org +Fixes: 720344340fb9 ("netfilter: nf_tables: GC transaction race with abort path") +Reported-by: Kuan-Ting Chen +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_tables_api.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c +index 9801bac049e28..ca061fc0b1def 100644 +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -9880,11 +9880,6 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) + nf_tables_abort_release(trans); + } + +- if (action == NFNL_ABORT_AUTOLOAD) +- nf_tables_module_autoload(net); +- else +- nf_tables_module_autoload_cleanup(net); +- + return err; + } + +@@ -9901,6 +9896,14 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, + + WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); + ++ /* module autoload needs to happen after GC sequence update because it ++ * temporarily releases and grabs mutex again. ++ */ ++ if (action == NFNL_ABORT_AUTOLOAD) ++ nf_tables_module_autoload(net); ++ else ++ nf_tables_module_autoload_cleanup(net); ++ + mutex_unlock(&nft_net->commit_mutex); + + return ret; +-- +2.43.0 + diff --git a/queue-5.15/panic-flush-kernel-log-buffer-at-the-end.patch b/queue-5.15/panic-flush-kernel-log-buffer-at-the-end.patch new file mode 100644 index 0000000000..3640472adb --- /dev/null +++ b/queue-5.15/panic-flush-kernel-log-buffer-at-the-end.patch @@ -0,0 +1,50 @@ +From 2fbdf981bab228903bd57cbfc603361421aee0af Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Feb 2024 14:47:02 +0106 +Subject: panic: Flush kernel log buffer at the end + +From: John Ogness + +[ Upstream commit d988d9a9b9d180bfd5c1d353b3b176cb90d6861b ] + +If the kernel crashes in a context where printk() calls always +defer printing (such as in NMI or inside a printk_safe section) +then the final panic messages will be deferred to irq_work. But +if irq_work is not available, the messages will not get printed +unless explicitly flushed. The result is that the final +"end Kernel panic" banner does not get printed. + +Add one final flush after the last printk() call to make sure +the final panic messages make it out as well. + +Signed-off-by: John Ogness +Reviewed-by: Petr Mladek +Link: https://lore.kernel.org/r/20240207134103.1357162-14-john.ogness@linutronix.de +Signed-off-by: Petr Mladek +Signed-off-by: Sasha Levin +--- + kernel/panic.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/kernel/panic.c b/kernel/panic.c +index 47933d4c769b6..3b14c6d123ddc 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -425,6 +425,14 @@ void panic(const char *fmt, ...) + + /* Do not scroll important messages printed above */ + suppress_printk = 1; ++ ++ /* ++ * The final messages may not have been printed if in a context that ++ * defers printing (such as NMI) and irq_work is not available. ++ * Explicitly flush the kernel log buffer one last time. ++ */ ++ console_flush_on_panic(CONSOLE_FLUSH_PENDING); ++ + local_irq_enable(); + for (i = 0; ; i += PANIC_TIMER_STEP) { + touch_softlockup_watchdog(); +-- +2.43.0 + diff --git a/queue-5.15/pinctrl-renesas-checker-limit-cfg-reg-enum-checks-to.patch b/queue-5.15/pinctrl-renesas-checker-limit-cfg-reg-enum-checks-to.patch new file mode 100644 index 0000000000..50961aa2d6 --- /dev/null +++ b/queue-5.15/pinctrl-renesas-checker-limit-cfg-reg-enum-checks-to.patch @@ -0,0 +1,49 @@ +From ff8c769cb965bdece96cb9d496be971a10a6886c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Jan 2024 14:43:38 +0100 +Subject: pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs + +From: Geert Uytterhoeven + +[ Upstream commit 3803584a4e9b65bb5b013f862f55c5055aa86c25 ] + +If the number of provided enum IDs in a variable width config register +description does not match the expected number, the checker uses the +expected number for validating the individual enum IDs. + +However, this may cause out-of-bounds accesses on the array holding the +enum IDs, leading to bogus enum_id conflict warnings. Worse, if the bug +is an incorrect bit field description (e.g. accidentally using "12" +instead of "-12" for a reserved field), thousands of warnings may be +printed, overflowing the kernel log buffer. + +Fix this by limiting the enum ID check to the number of provided enum +IDs. + +Signed-off-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/c7385f44f2faebb8856bcbb4e908d846fc1531fb.1705930809.git.geert+renesas@glider.be +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/renesas/core.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/renesas/core.c b/drivers/pinctrl/renesas/core.c +index 75fc420b6bdf1..8d3b75231f39e 100644 +--- a/drivers/pinctrl/renesas/core.c ++++ b/drivers/pinctrl/renesas/core.c +@@ -868,9 +868,11 @@ static void __init sh_pfc_check_cfg_reg(const char *drvname, + sh_pfc_err("reg 0x%x: var_field_width declares %u instead of %u bits\n", + cfg_reg->reg, rw, cfg_reg->reg_width); + +- if (n != cfg_reg->nr_enum_ids) ++ if (n != cfg_reg->nr_enum_ids) { + sh_pfc_err("reg 0x%x: enum_ids[] has %u instead of %u values\n", + cfg_reg->reg, cfg_reg->nr_enum_ids, n); ++ n = cfg_reg->nr_enum_ids; ++ } + + check_enum_ids: + sh_pfc_check_reg_enums(drvname, cfg_reg->reg, cfg_reg->enum_ids, n); +-- +2.43.0 + diff --git a/queue-5.15/platform-x86-touchscreen_dmi-add-an-extra-entry-for-.patch b/queue-5.15/platform-x86-touchscreen_dmi-add-an-extra-entry-for-.patch new file mode 100644 index 0000000000..652b65740b --- /dev/null +++ b/queue-5.15/platform-x86-touchscreen_dmi-add-an-extra-entry-for-.patch @@ -0,0 +1,45 @@ +From 706eea591f4a21b6042d4626603a215ed4acbce1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 27 Feb 2024 22:40:17 +0000 +Subject: platform/x86: touchscreen_dmi: Add an extra entry for a variant of + the Chuwi Vi8 tablet +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alban Boyé + +[ Upstream commit 1266e2efb7512dbf20eac820ca2ed34de6b1c3e7 ] + +Signed-off-by: Alban Boyé +Link: https://lore.kernel.org/r/20240227223919.11587-1-alban.boye@protonmail.com +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/touchscreen_dmi.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c +index 08a9b802be712..161bd19441042 100644 +--- a/drivers/platform/x86/touchscreen_dmi.c ++++ b/drivers/platform/x86/touchscreen_dmi.c +@@ -1153,6 +1153,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { + DMI_MATCH(DMI_BIOS_VERSION, "CHUWI.D86JLBNR"), + }, + }, ++ { ++ /* Chuwi Vi8 dual-boot (CWI506) */ ++ .driver_data = (void *)&chuwi_vi8_data, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Insyde"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "i86"), ++ DMI_MATCH(DMI_BIOS_VERSION, "CHUWI2.D86JHBNR02"), ++ }, ++ }, + { + /* Chuwi Vi8 Plus (CWI519) */ + .driver_data = (void *)&chuwi_vi8_plus_data, +-- +2.43.0 + diff --git a/queue-5.15/pstore-zone-add-a-null-pointer-check-to-the-psz_kmsg.patch b/queue-5.15/pstore-zone-add-a-null-pointer-check-to-the-psz_kmsg.patch new file mode 100644 index 0000000000..c39d13c313 --- /dev/null +++ b/queue-5.15/pstore-zone-add-a-null-pointer-check-to-the-psz_kmsg.patch @@ -0,0 +1,37 @@ +From cdeeae756d9782e5801f02bdff459406d335e252 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Jan 2024 18:02:06 +0800 +Subject: pstore/zone: Add a null pointer check to the psz_kmsg_read + +From: Kunwu Chan + +[ Upstream commit 98bc7e26e14fbb26a6abf97603d59532475e97f8 ] + +kasprintf() returns a pointer to dynamically allocated memory +which can be NULL upon failure. Ensure the allocation was successful +by checking the pointer validity. + +Signed-off-by: Kunwu Chan +Link: https://lore.kernel.org/r/20240118100206.213928-1-chentao@kylinos.cn +Signed-off-by: Kees Cook +Signed-off-by: Sasha Levin +--- + fs/pstore/zone.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c +index 5d3f944f60185..295040c249d91 100644 +--- a/fs/pstore/zone.c ++++ b/fs/pstore/zone.c +@@ -973,6 +973,8 @@ static ssize_t psz_kmsg_read(struct pstore_zone *zone, + char *buf = kasprintf(GFP_KERNEL, "%s: Total %d times\n", + kmsg_dump_reason_str(record->reason), + record->count); ++ if (!buf) ++ return -ENOMEM; + hlen = strlen(buf); + record->buf = krealloc(buf, hlen + size, GFP_KERNEL); + if (!record->buf) { +-- +2.43.0 + diff --git a/queue-5.15/rdma-cm-add-timeout-to-cm_destroy_id-wait.patch b/queue-5.15/rdma-cm-add-timeout-to-cm_destroy_id-wait.patch new file mode 100644 index 0000000000..db7d50042f --- /dev/null +++ b/queue-5.15/rdma-cm-add-timeout-to-cm_destroy_id-wait.patch @@ -0,0 +1,102 @@ +From fb817b89a010fa08bcbc617f31b7e05e9e2284ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Mar 2024 22:33:23 -0800 +Subject: RDMA/cm: add timeout to cm_destroy_id wait + +From: Manjunath Patil + +[ Upstream commit 96d9cbe2f2ff7abde021bac75eafaceabe9a51fa ] + +Add timeout to cm_destroy_id, so that userspace can trigger any data +collection that would help in analyzing the cause of delay in destroying +the cm_id. + +New noinline function helps dtrace/ebpf programs to hook on to it. +Existing functionality isn't changed except triggering a probe-able new +function at every timeout interval. + +We have seen cases where CM messages stuck with MAD layer (either due to +software bug or faulty HCA), leading to cm_id getting stuck in the +following call stack. This patch helps in resolving such issues faster. + +kernel: ... INFO: task XXXX:56778 blocked for more than 120 seconds. +... + Call Trace: + __schedule+0x2bc/0x895 + schedule+0x36/0x7c + schedule_timeout+0x1f6/0x31f + ? __slab_free+0x19c/0x2ba + wait_for_completion+0x12b/0x18a + ? wake_up_q+0x80/0x73 + cm_destroy_id+0x345/0x610 [ib_cm] + ib_destroy_cm_id+0x10/0x20 [ib_cm] + rdma_destroy_id+0xa8/0x300 [rdma_cm] + ucma_destroy_id+0x13e/0x190 [rdma_ucm] + ucma_write+0xe0/0x160 [rdma_ucm] + __vfs_write+0x3a/0x16d + vfs_write+0xb2/0x1a1 + ? syscall_trace_enter+0x1ce/0x2b8 + SyS_write+0x5c/0xd3 + do_syscall_64+0x79/0x1b9 + entry_SYSCALL_64_after_hwframe+0x16d/0x0 + +Signed-off-by: Manjunath Patil +Link: https://lore.kernel.org/r/20240309063323.458102-1-manjunath.b.patil@oracle.com +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/cm.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c +index 680c3ac8cd4c0..504e1adf1997a 100644 +--- a/drivers/infiniband/core/cm.c ++++ b/drivers/infiniband/core/cm.c +@@ -34,6 +34,7 @@ MODULE_AUTHOR("Sean Hefty"); + MODULE_DESCRIPTION("InfiniBand CM"); + MODULE_LICENSE("Dual BSD/GPL"); + ++#define CM_DESTROY_ID_WAIT_TIMEOUT 10000 /* msecs */ + static const char * const ibcm_rej_reason_strs[] = { + [IB_CM_REJ_NO_QP] = "no QP", + [IB_CM_REJ_NO_EEC] = "no EEC", +@@ -1032,10 +1033,20 @@ static void cm_reset_to_idle(struct cm_id_private *cm_id_priv) + } + } + ++static noinline void cm_destroy_id_wait_timeout(struct ib_cm_id *cm_id) ++{ ++ struct cm_id_private *cm_id_priv; ++ ++ cm_id_priv = container_of(cm_id, struct cm_id_private, id); ++ pr_err("%s: cm_id=%p timed out. state=%d refcnt=%d\n", __func__, ++ cm_id, cm_id->state, refcount_read(&cm_id_priv->refcount)); ++} ++ + static void cm_destroy_id(struct ib_cm_id *cm_id, int err) + { + struct cm_id_private *cm_id_priv; + struct cm_work *work; ++ int ret; + + cm_id_priv = container_of(cm_id, struct cm_id_private, id); + spin_lock_irq(&cm_id_priv->lock); +@@ -1142,7 +1153,14 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err) + + xa_erase(&cm.local_id_table, cm_local_id(cm_id->local_id)); + cm_deref_id(cm_id_priv); +- wait_for_completion(&cm_id_priv->comp); ++ do { ++ ret = wait_for_completion_timeout(&cm_id_priv->comp, ++ msecs_to_jiffies( ++ CM_DESTROY_ID_WAIT_TIMEOUT)); ++ if (!ret) /* timeout happened */ ++ cm_destroy_id_wait_timeout(cm_id); ++ } while (!ret); ++ + while ((work = cm_dequeue_work(cm_id_priv)) != NULL) + cm_free_work(work); + +-- +2.43.0 + diff --git a/queue-5.15/revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch b/queue-5.15/revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch new file mode 100644 index 0000000000..7594d1a712 --- /dev/null +++ b/queue-5.15/revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch @@ -0,0 +1,58 @@ +From c67b055bebba9e37f7509751d96c6815b578da2b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 28 Feb 2024 08:53:16 +0100 +Subject: Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by + default" + +From: Daniel Drake + +[ Upstream commit cb98555fcd8eee98c30165537c7e394f3a66e809 ] + +This reverts commit d52848620de00cde4a3a5df908e231b8c8868250, which was +originally put in place to work around a s2idle failure on this platform +where the NVMe device was inaccessible upon resume. + +After extended testing, we found that the firmware's implementation of S3 +is buggy and intermittently fails to wake up the system. We need to revert +to s2idle mode. + +The NVMe issue has now been solved more precisely in the commit titled +"PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge" + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742 +Link: https://lore.kernel.org/r/20240228075316.7404-2-drake@endlessos.org +Signed-off-by: Daniel Drake +Signed-off-by: Bjorn Helgaas +Acked-by: Jian-Hong Pan +Acked-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/sleep.c | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c +index b277e25b276ce..95deb55fb9a8c 100644 +--- a/drivers/acpi/sleep.c ++++ b/drivers/acpi/sleep.c +@@ -382,18 +382,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { + DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), + }, + }, +- /* +- * ASUS B1400CEAE hangs on resume from suspend (see +- * https://bugzilla.kernel.org/show_bug.cgi?id=215742). +- */ +- { +- .callback = init_default_s3, +- .ident = "ASUS B1400CEAE", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), +- DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"), +- }, +- }, + {}, + }; + +-- +2.43.0 + diff --git a/queue-5.15/ring-buffer-use-read_once-to-read-cpu_buffer-commit_.patch b/queue-5.15/ring-buffer-use-read_once-to-read-cpu_buffer-commit_.patch new file mode 100644 index 0000000000..b618de4509 --- /dev/null +++ b/queue-5.15/ring-buffer-use-read_once-to-read-cpu_buffer-commit_.patch @@ -0,0 +1,42 @@ +From 99e144ff7837af75ef05a020b17b9857d52c185a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 2 Mar 2024 12:42:21 +0800 +Subject: ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in + concurrent environment + +From: linke li + +[ Upstream commit f1e30cb6369251c03f63c564006f96a54197dcc4 ] + +In function ring_buffer_iter_empty(), cpu_buffer->commit_page is read +while other threads may change it. It may cause the time_stamp that read +in the next line come from a different page. Use READ_ONCE() to avoid +having to reason about compiler optimizations now and in future. + +Link: https://lore.kernel.org/linux-trace-kernel/tencent_DFF7D3561A0686B5E8FC079150A02505180A@qq.com + +Cc: Masami Hiramatsu +Cc: Mathieu Desnoyers +Signed-off-by: linke li +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/ring_buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c +index 80ec515ae81e7..c6bcb80785d8f 100644 +--- a/kernel/trace/ring_buffer.c ++++ b/kernel/trace/ring_buffer.c +@@ -4390,7 +4390,7 @@ int ring_buffer_iter_empty(struct ring_buffer_iter *iter) + cpu_buffer = iter->cpu_buffer; + reader = cpu_buffer->reader_page; + head_page = cpu_buffer->head_page; +- commit_page = cpu_buffer->commit_page; ++ commit_page = READ_ONCE(cpu_buffer->commit_page); + commit_ts = commit_page->page->time_stamp; + + /* +-- +2.43.0 + diff --git a/queue-5.15/scsi-lpfc-fix-possible-memory-leak-in-lpfc_rcv_padis.patch b/queue-5.15/scsi-lpfc-fix-possible-memory-leak-in-lpfc_rcv_padis.patch new file mode 100644 index 0000000000..aeb85eb7b8 --- /dev/null +++ b/queue-5.15/scsi-lpfc-fix-possible-memory-leak-in-lpfc_rcv_padis.patch @@ -0,0 +1,45 @@ +From 9e5b85c0f070922ac2a3e2221ca79a86b4e8906d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 31 Jan 2024 10:50:57 -0800 +Subject: scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc() + +From: Justin Tee + +[ Upstream commit 2ae917d4bcab80ab304b774d492e2fcd6c52c06b ] + +The call to lpfc_sli4_resume_rpi() in lpfc_rcv_padisc() may return an +unsuccessful status. In such cases, the elsiocb is not issued, the +completion is not called, and thus the elsiocb resource is leaked. + +Check return value after calling lpfc_sli4_resume_rpi() and conditionally +release the elsiocb resource. + +Signed-off-by: Justin Tee +Link: https://lore.kernel.org/r/20240131185112.149731-3-justintee8345@gmail.com +Reviewed-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_nportdisc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c +index 2bd35a7424c25..9b862f1254a42 100644 +--- a/drivers/scsi/lpfc/lpfc_nportdisc.c ++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c +@@ -724,8 +724,10 @@ lpfc_rcv_padisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, + /* Save the ELS cmd */ + elsiocb->drvrTimeout = cmd; + +- lpfc_sli4_resume_rpi(ndlp, +- lpfc_mbx_cmpl_resume_rpi, elsiocb); ++ if (lpfc_sli4_resume_rpi(ndlp, ++ lpfc_mbx_cmpl_resume_rpi, ++ elsiocb)) ++ kfree(elsiocb); + goto out; + } + } +-- +2.43.0 + diff --git a/queue-5.15/series b/queue-5.15/series index e8ea7150e9..4769b0f9da 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1 +1,48 @@ net-dsa-fix-panic-when-dsa-master-device-unbinds-on-shutdown.patch +wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch +batman-adv-return-directly-after-a-failed-batadv_dat.patch +batman-adv-improve-exception-handling-in-batadv_thro.patch +vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch +panic-flush-kernel-log-buffer-at-the-end.patch +cpuidle-avoid-potential-overflow-in-integer-multipli.patch +arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch +arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch +ionic-set-adminq-irq-affinity.patch +pstore-zone-add-a-null-pointer-check-to-the-psz_kmsg.patch +tools-power-x86_energy_perf_policy-fix-file-leak-in-.patch +net-pcs-xpcs-return-einval-in-the-internal-methods.patch +wifi-ath11k-decrease-mhi-channel-buffer-length-to-8k.patch +btrfs-handle-chunk-tree-lookup-error-in-btrfs_reloca.patch +btrfs-export-handle-invalid-inode-or-root-reference-.patch +btrfs-send-handle-path-ref-underflow-in-header-itera.patch +net-smc-reduce-rtnl-pressure-in-smc_pnet_create_pnet.patch +bluetooth-btintel-fix-null-ptr-deref-in-btintel_read.patch +input-synaptics-rmi4-fail-probing-if-memory-allocati.patch +pinctrl-renesas-checker-limit-cfg-reg-enum-checks-to.patch +sysv-don-t-call-sb_bread-with-pointers_lock-held.patch +scsi-lpfc-fix-possible-memory-leak-in-lpfc_rcv_padis.patch +isofs-handle-cds-with-bad-root-inode-but-good-joliet.patch +media-sta2x11-fix-irq-handler-cast.patch +alsa-firewire-lib-handle-quirk-to-calculate-payload-.patch +ext4-add-a-hint-for-block-bitmap-corrupt-state-in-mb.patch +ext4-forbid-commit-inconsistent-quota-data-when-erro.patch +drm-amd-display-fix-nanosec-stat-overflow.patch +sunrpc-increase-size-of-rpc_wait_queue.qlen-from-uns.patch +revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch +libperf-evlist-avoid-out-of-bounds-access.patch +block-prevent-division-by-zero-in-blk_rq_stat_sum.patch +rdma-cm-add-timeout-to-cm_destroy_id-wait.patch +input-allocate-keycode-for-display-refresh-rate-togg.patch +platform-x86-touchscreen_dmi-add-an-extra-entry-for-.patch +ktest-force-buildonly-1-for-make_warnings_file-test-.patch +ring-buffer-use-read_once-to-read-cpu_buffer-commit_.patch +tools-iio-replace-seekdir-in-iio_generic_buffer.patch +usb-typec-tcpci-add-generic-tcpci-fallback-compatibl.patch +usb-sl811-hcd-only-defined-function-checkdone-if-qui.patch +asoc-soc-core.c-skip-dummy-codec-when-adding-platfor.patch +fbdev-viafb-fix-typo-in-hw_bitblt_1-and-hw_bitblt_2.patch +drivers-nvme-add-quirks-for-device-126f-2262.patch +fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch +netfilter-nf_tables-release-batch-on-table-validatio.patch +netfilter-nf_tables-release-mutex-after-nft_gc_seq_e.patch +netfilter-nf_tables-discard-table-flag-update-with-p.patch diff --git a/queue-5.15/sunrpc-increase-size-of-rpc_wait_queue.qlen-from-uns.patch b/queue-5.15/sunrpc-increase-size-of-rpc_wait_queue.qlen-from-uns.patch new file mode 100644 index 0000000000..ce8602fbed --- /dev/null +++ b/queue-5.15/sunrpc-increase-size-of-rpc_wait_queue.qlen-from-uns.patch @@ -0,0 +1,87 @@ +From 5d6685642fb08a5226194e049038284b72d0ab55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jan 2024 11:38:25 -0800 +Subject: SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to + unsigned int + +From: Dai Ngo + +[ Upstream commit 2c35f43b5a4b9cdfaa6fdd946f5a212615dac8eb ] + +When the NFS client is under extreme load the rpc_wait_queue.qlen counter +can be overflowed. Here is an instant of the backlog queue overflow in a +real world environment shown by drgn helper: + +rpc_task_stats(rpc_clnt): +------------------------- +rpc_clnt: 0xffff92b65d2bae00 +rpc_xprt: 0xffff9275db64f000 + Queue: sending[64887] pending[524] backlog[30441] binding[0] +XMIT task: 0xffff925c6b1d8e98 + WRITE: 750654 + __dta_call_status_580: 65463 + __dta_call_transmit_status_579: 1 + call_reserveresult: 685189 + nfs_client_init_is_complete: 1 + COMMIT: 584 + call_reserveresult: 573 + __dta_call_status_580: 11 + ACCESS: 1 + __dta_call_status_580: 1 + GETATTR: 10 + __dta_call_status_580: 4 + call_reserveresult: 6 +751249 tasks for server 111.222.333.444 +Total tasks: 751249 + +count_rpc_wait_queues(xprt): +---------------------------- +**** rpc_xprt: 0xffff9275db64f000 num_reqs: 65511 +wait_queue: xprt_binding[0] cnt: 0 +wait_queue: xprt_binding[1] cnt: 0 +wait_queue: xprt_binding[2] cnt: 0 +wait_queue: xprt_binding[3] cnt: 0 +rpc_wait_queue[xprt_binding].qlen: 0 maxpriority: 0 +wait_queue: xprt_sending[0] cnt: 0 +wait_queue: xprt_sending[1] cnt: 64887 +wait_queue: xprt_sending[2] cnt: 0 +wait_queue: xprt_sending[3] cnt: 0 +rpc_wait_queue[xprt_sending].qlen: 64887 maxpriority: 3 +wait_queue: xprt_pending[0] cnt: 524 +wait_queue: xprt_pending[1] cnt: 0 +wait_queue: xprt_pending[2] cnt: 0 +wait_queue: xprt_pending[3] cnt: 0 +rpc_wait_queue[xprt_pending].qlen: 524 maxpriority: 0 +wait_queue: xprt_backlog[0] cnt: 0 +wait_queue: xprt_backlog[1] cnt: 685801 +wait_queue: xprt_backlog[2] cnt: 0 +wait_queue: xprt_backlog[3] cnt: 0 +rpc_wait_queue[xprt_backlog].qlen: 30441 maxpriority: 3 [task cnt mismatch] + +There is no effect on operations when this overflow occurs. However +it causes confusion when trying to diagnose the performance problem. + +Signed-off-by: Dai Ngo +Reviewed-by: Jeff Layton +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + include/linux/sunrpc/sched.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h +index ba047a145e092..f5fe330e4f4da 100644 +--- a/include/linux/sunrpc/sched.h ++++ b/include/linux/sunrpc/sched.h +@@ -199,7 +199,7 @@ struct rpc_wait_queue { + unsigned char maxpriority; /* maximum priority (0 if queue is not a priority queue) */ + unsigned char priority; /* current priority */ + unsigned char nr; /* # tasks remaining for cookie */ +- unsigned short qlen; /* total # tasks waiting in queue */ ++ unsigned int qlen; /* total # tasks waiting in queue */ + struct rpc_timer timer_list; + #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS) + const char * name; +-- +2.43.0 + diff --git a/queue-5.15/sysv-don-t-call-sb_bread-with-pointers_lock-held.patch b/queue-5.15/sysv-don-t-call-sb_bread-with-pointers_lock-held.patch new file mode 100644 index 0000000000..95539b8507 --- /dev/null +++ b/queue-5.15/sysv-don-t-call-sb_bread-with-pointers_lock-held.patch @@ -0,0 +1,94 @@ +From f27eb58705bd82e4e6f5553816e528b8f341ece4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Apr 2023 21:04:50 +0900 +Subject: sysv: don't call sb_bread() with pointers_lock held + +From: Tetsuo Handa + +[ Upstream commit f123dc86388cb669c3d6322702dc441abc35c31e ] + +syzbot is reporting sleep in atomic context in SysV filesystem [1], for +sb_bread() is called with rw_spinlock held. + +A "write_lock(&pointers_lock) => read_lock(&pointers_lock) deadlock" bug +and a "sb_bread() with write_lock(&pointers_lock)" bug were introduced by +"Replace BKL for chain locking with sysvfs-private rwlock" in Linux 2.5.12. + +Then, "[PATCH] err1-40: sysvfs locking fix" in Linux 2.6.8 fixed the +former bug by moving pointers_lock lock to the callers, but instead +introduced a "sb_bread() with read_lock(&pointers_lock)" bug (which made +this problem easier to hit). + +Al Viro suggested that why not to do like get_branch()/get_block()/ +find_shared() in Minix filesystem does. And doing like that is almost a +revert of "[PATCH] err1-40: sysvfs locking fix" except that get_branch() + from with find_shared() is called without write_lock(&pointers_lock). + +Reported-by: syzbot +Link: https://syzkaller.appspot.com/bug?extid=69b40dc5fd40f32c199f +Suggested-by: Al Viro +Signed-off-by: Tetsuo Handa +Link: https://lore.kernel.org/r/0d195f93-a22a-49a2-0020-103534d6f7f6@I-love.SAKURA.ne.jp +Signed-off-by: Christian Brauner +Signed-off-by: Sasha Levin +--- + fs/sysv/itree.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c +index 1e9c520411f84..5800cb065ca58 100644 +--- a/fs/sysv/itree.c ++++ b/fs/sysv/itree.c +@@ -82,9 +82,6 @@ static inline sysv_zone_t *block_end(struct buffer_head *bh) + return (sysv_zone_t*)((char*)bh->b_data + bh->b_size); + } + +-/* +- * Requires read_lock(&pointers_lock) or write_lock(&pointers_lock) +- */ + static Indirect *get_branch(struct inode *inode, + int depth, + int offsets[], +@@ -104,15 +101,18 @@ static Indirect *get_branch(struct inode *inode, + bh = sb_bread(sb, block); + if (!bh) + goto failure; ++ read_lock(&pointers_lock); + if (!verify_chain(chain, p)) + goto changed; + add_chain(++p, bh, (sysv_zone_t*)bh->b_data + *++offsets); ++ read_unlock(&pointers_lock); + if (!p->key) + goto no_block; + } + return NULL; + + changed: ++ read_unlock(&pointers_lock); + brelse(bh); + *err = -EAGAIN; + goto no_block; +@@ -218,9 +218,7 @@ static int get_block(struct inode *inode, sector_t iblock, struct buffer_head *b + goto out; + + reread: +- read_lock(&pointers_lock); + partial = get_branch(inode, depth, offsets, chain, &err); +- read_unlock(&pointers_lock); + + /* Simplest case - block found, no allocation needed */ + if (!partial) { +@@ -290,9 +288,9 @@ static Indirect *find_shared(struct inode *inode, + *top = 0; + for (k = depth; k > 1 && !offsets[k-1]; k--) + ; ++ partial = get_branch(inode, k, offsets, chain, &err); + + write_lock(&pointers_lock); +- partial = get_branch(inode, k, offsets, chain, &err); + if (!partial) + partial = chain + k-1; + /* +-- +2.43.0 + diff --git a/queue-5.15/tools-iio-replace-seekdir-in-iio_generic_buffer.patch b/queue-5.15/tools-iio-replace-seekdir-in-iio_generic_buffer.patch new file mode 100644 index 0000000000..5c3f9ff435 --- /dev/null +++ b/queue-5.15/tools-iio-replace-seekdir-in-iio_generic_buffer.patch @@ -0,0 +1,45 @@ +From 1f62174b670ee784ffa8646039ae9caeff9294ef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Jan 2024 12:32:20 +0200 +Subject: tools: iio: replace seekdir() in iio_generic_buffer + +From: Petre Rodan + +[ Upstream commit 4e6500bfa053dc133021f9c144261b77b0ba7dc8 ] + +Replace seekdir() with rewinddir() in order to fix a localized glibc bug. + +One of the glibc patches that stable Gentoo is using causes an improper +directory stream positioning bug on 32bit arm. That in turn ends up as a +floating point exception in iio_generic_buffer. + +The attached patch provides a fix by using an equivalent function which +should not cause trouble for other distros and is easier to reason about +in general as it obviously always goes back to to the start. + +https://sourceware.org/bugzilla/show_bug.cgi?id=31212 + +Signed-off-by: Petre Rodan +Link: https://lore.kernel.org/r/20240108103224.3986-1-petre.rodan@subdimension.ro +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + tools/iio/iio_utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c +index 6a00a6eecaef0..c5c5082cb24e5 100644 +--- a/tools/iio/iio_utils.c ++++ b/tools/iio/iio_utils.c +@@ -376,7 +376,7 @@ int build_channel_array(const char *device_dir, int buffer_idx, + goto error_close_dir; + } + +- seekdir(dp, 0); ++ rewinddir(dp); + while (ent = readdir(dp), ent) { + if (strcmp(ent->d_name + strlen(ent->d_name) - strlen("_en"), + "_en") == 0) { +-- +2.43.0 + diff --git a/queue-5.15/tools-power-x86_energy_perf_policy-fix-file-leak-in-.patch b/queue-5.15/tools-power-x86_energy_perf_policy-fix-file-leak-in-.patch new file mode 100644 index 0000000000..54770fc8e8 --- /dev/null +++ b/queue-5.15/tools-power-x86_energy_perf_policy-fix-file-leak-in-.patch @@ -0,0 +1,35 @@ +From 296378d3ff31bdb5eb2888d6bea7982fa1bb2340 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Feb 2024 16:19:56 -0800 +Subject: tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num() + +From: Samasth Norway Ananda + +[ Upstream commit f85450f134f0b4ca7e042dc3dc89155656a2299d ] + +In function get_pkg_num() if fopen_or_die() succeeds it returns a file +pointer to be used. But fclose() is never called before returning from +the function. + +Signed-off-by: Samasth Norway Ananda +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +index 5fd9e594079cf..ebda9c366b2ba 100644 +--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c ++++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +@@ -1241,6 +1241,7 @@ unsigned int get_pkg_num(int cpu) + retval = fscanf(fp, "%d\n", &pkg); + if (retval != 1) + errx(1, "%s: failed to parse", pathname); ++ fclose(fp); + return pkg; + } + +-- +2.43.0 + diff --git a/queue-5.15/usb-sl811-hcd-only-defined-function-checkdone-if-qui.patch b/queue-5.15/usb-sl811-hcd-only-defined-function-checkdone-if-qui.patch new file mode 100644 index 0000000000..59845e2024 --- /dev/null +++ b/queue-5.15/usb-sl811-hcd-only-defined-function-checkdone-if-qui.patch @@ -0,0 +1,47 @@ +From 59f3197bd53575ba10b6d199f03f279adacb56da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Mar 2024 11:13:51 +0000 +Subject: usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined + +From: Colin Ian King + +[ Upstream commit 12f371e2b6cb4b79c788f1f073992e115f4ca918 ] + +Function checkdone is only required if QUIRK2 is defined, so add +appropriate #if / #endif around the function. + +Cleans up clang scan build warning: +drivers/usb/host/sl811-hcd.c:588:18: warning: unused function +'checkdone' [-Wunused-function] + +Signed-off-by: Colin Ian King +Link: https://lore.kernel.org/r/20240307111351.1982382-1-colin.i.king@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/sl811-hcd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c +index 825ff67273102..d3de9f47552d0 100644 +--- a/drivers/usb/host/sl811-hcd.c ++++ b/drivers/usb/host/sl811-hcd.c +@@ -585,6 +585,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) + finish_request(sl811, ep, urb, urbstat); + } + ++#ifdef QUIRK2 + static inline u8 checkdone(struct sl811 *sl811) + { + u8 ctl; +@@ -616,6 +617,7 @@ static inline u8 checkdone(struct sl811 *sl811) + #endif + return irqstat; + } ++#endif + + static irqreturn_t sl811h_irq(struct usb_hcd *hcd) + { +-- +2.43.0 + diff --git a/queue-5.15/usb-typec-tcpci-add-generic-tcpci-fallback-compatibl.patch b/queue-5.15/usb-typec-tcpci-add-generic-tcpci-fallback-compatibl.patch new file mode 100644 index 0000000000..c6200a9f93 --- /dev/null +++ b/queue-5.15/usb-typec-tcpci-add-generic-tcpci-fallback-compatibl.patch @@ -0,0 +1,36 @@ +From ee7317bfb262b2dc10e3ee351f6a75c6681118f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Feb 2024 22:09:01 +0100 +Subject: usb: typec: tcpci: add generic tcpci fallback compatible + +From: Marco Felsch + +[ Upstream commit 8774ea7a553e2aec323170d49365b59af0a2b7e0 ] + +The driver already support the tcpci binding for the i2c_device_id so +add the support for the of_device_id too. + +Signed-off-by: Marco Felsch +Reviewed-by: Heikki Krogerus +Link: https://lore.kernel.org/r/20240222210903.208901-3-m.felsch@pengutronix.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/typec/tcpm/tcpci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c +index a7b0134d382b8..e047a15e67347 100644 +--- a/drivers/usb/typec/tcpm/tcpci.c ++++ b/drivers/usb/typec/tcpm/tcpci.c +@@ -899,6 +899,7 @@ MODULE_DEVICE_TABLE(i2c, tcpci_id); + #ifdef CONFIG_OF + static const struct of_device_id tcpci_of_match[] = { + { .compatible = "nxp,ptn5110", }, ++ { .compatible = "tcpci", }, + {}, + }; + MODULE_DEVICE_TABLE(of, tcpci_of_match); +-- +2.43.0 + diff --git a/queue-5.15/vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch b/queue-5.15/vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch new file mode 100644 index 0000000000..172856b023 --- /dev/null +++ b/queue-5.15/vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch @@ -0,0 +1,80 @@ +From 8c37bcb6a05be64cdfb04a109f87a83d20bf297b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Jan 2024 08:40:00 -0800 +Subject: VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() + +From: Harshit Mogalapalli + +[ Upstream commit 19b070fefd0d024af3daa7329cbc0d00de5302ec ] + +Syzkaller hit 'WARNING in dg_dispatch_as_host' bug. + +memcpy: detected field-spanning write (size 56) of single field "&dg_info->msg" +at drivers/misc/vmw_vmci/vmci_datagram.c:237 (size 24) + +WARNING: CPU: 0 PID: 1555 at drivers/misc/vmw_vmci/vmci_datagram.c:237 +dg_dispatch_as_host+0x88e/0xa60 drivers/misc/vmw_vmci/vmci_datagram.c:237 + +Some code commentry, based on my understanding: + +544 #define VMCI_DG_SIZE(_dg) (VMCI_DG_HEADERSIZE + (size_t)(_dg)->payload_size) +/// This is 24 + payload_size + +memcpy(&dg_info->msg, dg, dg_size); + Destination = dg_info->msg ---> this is a 24 byte + structure(struct vmci_datagram) + Source = dg --> this is a 24 byte structure (struct vmci_datagram) + Size = dg_size = 24 + payload_size + +{payload_size = 56-24 =32} -- Syzkaller managed to set payload_size to 32. + + 35 struct delayed_datagram_info { + 36 struct datagram_entry *entry; + 37 struct work_struct work; + 38 bool in_dg_host_queue; + 39 /* msg and msg_payload must be together. */ + 40 struct vmci_datagram msg; + 41 u8 msg_payload[]; + 42 }; + +So those extra bytes of payload are copied into msg_payload[], a run time +warning is seen while fuzzing with Syzkaller. + +One possible way to fix the warning is to split the memcpy() into +two parts -- one -- direct assignment of msg and second taking care of payload. + +Gustavo quoted: +"Under FORTIFY_SOURCE we should not copy data across multiple members +in a structure." + +Reported-by: syzkaller +Suggested-by: Vegard Nossum +Suggested-by: Gustavo A. R. Silva +Signed-off-by: Harshit Mogalapalli +Reviewed-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Reviewed-by: Dan Carpenter +Link: https://lore.kernel.org/r/20240105164001.2129796-2-harshit.m.mogalapalli@oracle.com +Signed-off-by: Kees Cook +Signed-off-by: Sasha Levin +--- + drivers/misc/vmw_vmci/vmci_datagram.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/misc/vmw_vmci/vmci_datagram.c b/drivers/misc/vmw_vmci/vmci_datagram.c +index f50d22882476f..d1d8224c8800c 100644 +--- a/drivers/misc/vmw_vmci/vmci_datagram.c ++++ b/drivers/misc/vmw_vmci/vmci_datagram.c +@@ -234,7 +234,8 @@ static int dg_dispatch_as_host(u32 context_id, struct vmci_datagram *dg) + + dg_info->in_dg_host_queue = true; + dg_info->entry = dst_entry; +- memcpy(&dg_info->msg, dg, dg_size); ++ dg_info->msg = *dg; ++ memcpy(&dg_info->msg_payload, dg + 1, dg->payload_size); + + INIT_WORK(&dg_info->work, dg_delayed_dispatch); + schedule_work(&dg_info->work); +-- +2.43.0 + diff --git a/queue-5.15/wifi-ath11k-decrease-mhi-channel-buffer-length-to-8k.patch b/queue-5.15/wifi-ath11k-decrease-mhi-channel-buffer-length-to-8k.patch new file mode 100644 index 0000000000..d94e528154 --- /dev/null +++ b/queue-5.15/wifi-ath11k-decrease-mhi-channel-buffer-length-to-8k.patch @@ -0,0 +1,92 @@ +From a29b24a098a0d0e99d994f116b37b6d1a01b432f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Feb 2024 13:31:11 +0800 +Subject: wifi: ath11k: decrease MHI channel buffer length to 8KB + +From: Baochen Qiang + +[ Upstream commit 1cca1bddf9ef080503c15378cecf4877f7510015 ] + +Currently buf_len field of ath11k_mhi_config_qca6390 is assigned +with 0, making MHI use a default size, 64KB, to allocate channel +buffers. This is likely to fail in some scenarios where system +memory is highly fragmented and memory compaction or reclaim is +not allowed. + +There is a fail report which is caused by it: +kworker/u32:45: page allocation failure: order:4, mode:0x40c00(GFP_NOIO|__GFP_COMP), nodemask=(null),cpuset=/,mems_allowed=0 +CPU: 0 PID: 19318 Comm: kworker/u32:45 Not tainted 6.8.0-rc3-1.gae4495f-default #1 openSUSE Tumbleweed (unreleased) 493b6d5b382c603654d7a81fc3c144d59a1dfceb +Workqueue: events_unbound async_run_entry_fn +Call Trace: + + dump_stack_lvl+0x47/0x60 + warn_alloc+0x13a/0x1b0 + ? srso_alias_return_thunk+0x5/0xfbef5 + ? __alloc_pages_direct_compact+0xab/0x210 + __alloc_pages_slowpath.constprop.0+0xd3e/0xda0 + __alloc_pages+0x32d/0x350 + ? mhi_prepare_channel+0x127/0x2d0 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + __kmalloc_large_node+0x72/0x110 + __kmalloc+0x37c/0x480 + ? mhi_map_single_no_bb+0x77/0xf0 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + ? mhi_prepare_channel+0x127/0x2d0 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + mhi_prepare_channel+0x127/0x2d0 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + __mhi_prepare_for_transfer+0x44/0x80 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + ? __pfx_____mhi_prepare_for_transfer+0x10/0x10 [mhi 40df44e07c05479f7a6e7b90fba9f0e0031a7814] + device_for_each_child+0x5c/0xa0 + ? __pfx_pci_pm_resume+0x10/0x10 + ath11k_core_resume+0x65/0x100 [ath11k a5094e22d7223135c40d93c8f5321cf09fd85e4e] + ? srso_alias_return_thunk+0x5/0xfbef5 + ath11k_pci_pm_resume+0x32/0x60 [ath11k_pci 830b7bfc3ea80ebef32e563cafe2cb55e9cc73ec] + ? srso_alias_return_thunk+0x5/0xfbef5 + dpm_run_callback+0x8c/0x1e0 + device_resume+0x104/0x340 + ? __pfx_dpm_watchdog_handler+0x10/0x10 + async_resume+0x1d/0x30 + async_run_entry_fn+0x32/0x120 + process_one_work+0x168/0x330 + worker_thread+0x2f5/0x410 + ? __pfx_worker_thread+0x10/0x10 + kthread+0xe8/0x120 + ? __pfx_kthread+0x10/0x10 + ret_from_fork+0x34/0x50 + ? __pfx_kthread+0x10/0x10 + ret_from_fork_asm+0x1b/0x30 + + +Actually those buffers are used only by QMI target -> host communication. +And for WCN6855 and QCA6390, the largest packet size for that is less +than 6KB. So change buf_len field to 8KB, which results in order 1 +allocation if page size is 4KB. In this way, we can at least save some +memory, and as well as decrease the possibility of allocation failure +in those scenarios. + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30 + +Reported-by: Vlastimil Babka +Closes: https://lore.kernel.org/ath11k/96481a45-3547-4d23-ad34-3a8f1d90c1cd@suse.cz/ +Signed-off-by: Baochen Qiang +Acked-by: Jeff Johnson +Signed-off-by: Kalle Valo +Link: https://msgid.link/20240223053111.29170-1-quic_bqiang@quicinc.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/mhi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c +index f2149241fb131..265b85c40a4ad 100644 +--- a/drivers/net/wireless/ath/ath11k/mhi.c ++++ b/drivers/net/wireless/ath/ath11k/mhi.c +@@ -97,7 +97,7 @@ static struct mhi_controller_config ath11k_mhi_config_qca6390 = { + .max_channels = 128, + .timeout_ms = 2000, + .use_bounce_buf = false, +- .buf_len = 0, ++ .buf_len = 8192, + .num_channels = ARRAY_SIZE(ath11k_mhi_channels_qca6390), + .ch_cfg = ath11k_mhi_channels_qca6390, + .num_events = ARRAY_SIZE(ath11k_mhi_events_qca6390), +-- +2.43.0 + diff --git a/queue-5.15/wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch b/queue-5.15/wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch new file mode 100644 index 0000000000..d2698c7eac --- /dev/null +++ b/queue-5.15/wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch @@ -0,0 +1,43 @@ +From d9a2c03e505c9689fd3ce0e09ca1f98531d56cb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 17 Dec 2023 13:29:03 +0200 +Subject: wifi: ath9k: fix LNA selection in ath_ant_try_scan() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dmitry Antipov + +[ Upstream commit d6b27eb997ef9a2aa51633b3111bc4a04748e6d3 ] + +In 'ath_ant_try_scan()', (most likely) the 2nd LNA's signal +strength should be used in comparison against RSSI when +selecting first LNA as the main one. Compile tested only. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Signed-off-by: Dmitry Antipov +Acked-by: Toke Høiland-Jørgensen +Signed-off-by: Kalle Valo +Link: https://msgid.link/20231211172502.25202-1-dmantipov@yandex.ru +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/antenna.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c +index 988222cea9dfe..acc84e6711b0e 100644 +--- a/drivers/net/wireless/ath/ath9k/antenna.c ++++ b/drivers/net/wireless/ath/ath9k/antenna.c +@@ -643,7 +643,7 @@ static void ath_ant_try_scan(struct ath_ant_comb *antcomb, + conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1; + conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + } else if (antcomb->rssi_sub > +- antcomb->rssi_lna1) { ++ antcomb->rssi_lna2) { + /* set to A-B */ + conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1; + conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; +-- +2.43.0 +