--- /dev/null
+From 295217420a44403a33c30f99d8337fe7b07eb02b Mon Sep 17 00:00:00 2001
+From: Alok Tiwari <alok.a.tiwari@oracle.com>
+Date: Wed, 14 May 2025 04:46:51 -0700
+Subject: arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node
+
+From: Alok Tiwari <alok.a.tiwari@oracle.com>
+
+commit 295217420a44403a33c30f99d8337fe7b07eb02b upstream.
+
+There is a typo in sm8350.dts where the node label
+mmeory@85200000 should be memory@85200000.
+This patch corrects the typo for clarity and consistency.
+
+Fixes: b7e8f433a673 ("arm64: dts: qcom: Add basic devicetree support for SM8350 SoC")
+Cc: stable@vger.kernel.org
+Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
+Link: https://lore.kernel.org/r/20250514114656.2307828-1-alok.a.tiwari@oracle.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
++++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
+@@ -421,7 +421,7 @@
+ no-map;
+ };
+
+- pil_camera_mem: mmeory@85200000 {
++ pil_camera_mem: memory@85200000 {
+ reg = <0x0 0x85200000 0x0 0x500000>;
+ no-map;
+ };
--- /dev/null
+From ac9fe7dd8e730a103ae4481147395cc73492d786 Mon Sep 17 00:00:00 2001
+From: Pedro Tammela <pctammela@mojatatu.com>
+Date: Thu, 22 May 2025 15:14:47 -0300
+Subject: net_sched: hfsc: Address reentrant enqueue adding class to eltree twice
+
+From: Pedro Tammela <pctammela@mojatatu.com>
+
+commit ac9fe7dd8e730a103ae4481147395cc73492d786 upstream.
+
+Savino says:
+ "We are writing to report that this recent patch
+ (141d34391abbb315d68556b7c67ad97885407547) [1]
+ can be bypassed, and a UAF can still occur when HFSC is utilized with
+ NETEM.
+
+ The patch only checks the cl->cl_nactive field to determine whether
+ it is the first insertion or not [2], but this field is only
+ incremented by init_vf [3].
+
+ By using HFSC_RSC (which uses init_ed) [4], it is possible to bypass the
+ check and insert the class twice in the eltree.
+ Under normal conditions, this would lead to an infinite loop in
+ hfsc_dequeue for the reasons we already explained in this report [5].
+
+ However, if TBF is added as root qdisc and it is configured with a
+ very low rate,
+ it can be utilized to prevent packets from being dequeued.
+ This behavior can be exploited to perform subsequent insertions in the
+ HFSC eltree and cause a UAF."
+
+To fix both the UAF and the infinite loop, with netem as an hfsc child,
+check explicitly in hfsc_enqueue whether the class is already in the eltree
+whenever the HFSC_RSC flag is set.
+
+[1] https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=141d34391abbb315d68556b7c67ad97885407547
+[2] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L1572
+[3] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L677
+[4] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L1574
+[5] https://lore.kernel.org/netdev/8DuRWwfqjoRDLDmBMlIfbrsZg9Gx50DHJc1ilxsEBNe2D6NMoigR_eIRIG0LOjMc3r10nUUZtArXx4oZBIdUfZQrwjcQhdinnMis_0G7VEk=@willsroot.io/T/#u
+
+Fixes: 37d9cf1a3ce3 ("sched: Fix detection of empty queues in child qdiscs")
+Reported-by: Savino Dicanosa <savy@syst3mfailure.io>
+Reported-by: William Liu <will@willsroot.io>
+Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
+Tested-by: Victor Nogueira <victor@mojatatu.com>
+Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
+Link: https://patch.msgid.link/20250522181448.1439717-2-pctammela@mojatatu.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/sch_hfsc.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/net/sched/sch_hfsc.c
++++ b/net/sched/sch_hfsc.c
+@@ -176,6 +176,11 @@ struct hfsc_sched {
+
+ #define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */
+
++static bool cl_in_el_or_vttree(struct hfsc_class *cl)
++{
++ return ((cl->cl_flags & HFSC_FSC) && cl->cl_nactive) ||
++ ((cl->cl_flags & HFSC_RSC) && !RB_EMPTY_NODE(&cl->el_node));
++}
+
+ /*
+ * eligible tree holds backlogged classes being sorted by their eligible times.
+@@ -1041,6 +1046,8 @@ hfsc_change_class(struct Qdisc *sch, u32
+ if (cl == NULL)
+ return -ENOBUFS;
+
++ RB_CLEAR_NODE(&cl->el_node);
++
+ err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack);
+ if (err) {
+ kfree(cl);
+@@ -1571,7 +1578,7 @@ hfsc_enqueue(struct sk_buff *skb, struct
+ sch->qstats.backlog += len;
+ sch->q.qlen++;
+
+- if (first && !cl->cl_nactive) {
++ if (first && !cl_in_el_or_vttree(cl)) {
+ if (cl->cl_flags & HFSC_RSC)
+ init_ed(cl, len);
+ if (cl->cl_flags & HFSC_FSC)
--- /dev/null
+From 11b0f576e0cbde6a12258f2af6753b17b8df342b Mon Sep 17 00:00:00 2001
+From: Robin Murphy <robin.murphy@arm.com>
+Date: Thu, 8 May 2025 16:16:40 +0100
+Subject: perf/arm-cmn: Fix REQ2/SNP2 mixup
+
+From: Robin Murphy <robin.murphy@arm.com>
+
+commit 11b0f576e0cbde6a12258f2af6753b17b8df342b upstream.
+
+Somehow the encodings for REQ2/SNP2 channels in XP events
+got mixed up... Unmix them.
+
+CC: stable@vger.kernel.org
+Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support")
+Signed-off-by: Robin Murphy <robin.murphy@arm.com>
+Link: https://lore.kernel.org/r/087023e9737ac93d7ec7a841da904758c254cb01.1746717400.git.robin.murphy@arm.com
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/perf/arm-cmn.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/perf/arm-cmn.c
++++ b/drivers/perf/arm-cmn.c
+@@ -675,8 +675,8 @@ static umode_t arm_cmn_event_attr_is_vis
+
+ if ((chan == 5 && cmn->rsp_vc_num < 2) ||
+ (chan == 6 && cmn->dat_vc_num < 2) ||
+- (chan == 7 && cmn->snp_vc_num < 2) ||
+- (chan == 8 && cmn->req_vc_num < 2))
++ (chan == 7 && cmn->req_vc_num < 2) ||
++ (chan == 8 && cmn->snp_vc_num < 2))
+ return 0;
+ }
+
+@@ -794,8 +794,8 @@ static umode_t arm_cmn_event_attr_is_vis
+ _CMN_EVENT_XP(pub_##_name, (_event) | (4 << 5)), \
+ _CMN_EVENT_XP(rsp2_##_name, (_event) | (5 << 5)), \
+ _CMN_EVENT_XP(dat2_##_name, (_event) | (6 << 5)), \
+- _CMN_EVENT_XP(snp2_##_name, (_event) | (7 << 5)), \
+- _CMN_EVENT_XP(req2_##_name, (_event) | (8 << 5))
++ _CMN_EVENT_XP(req2_##_name, (_event) | (7 << 5)), \
++ _CMN_EVENT_XP(snp2_##_name, (_event) | (8 << 5))
+
+
+ static struct attribute *arm_cmn_event_attrs[] = {
--- /dev/null
+From 597704e201068db3d104de3c7a4d447ff8209127 Mon Sep 17 00:00:00 2001
+From: Robin Murphy <robin.murphy@arm.com>
+Date: Mon, 12 May 2025 18:11:54 +0100
+Subject: perf/arm-cmn: Initialise cmn->cpu earlier
+
+From: Robin Murphy <robin.murphy@arm.com>
+
+commit 597704e201068db3d104de3c7a4d447ff8209127 upstream.
+
+For all the complexity of handling affinity for CPU hotplug, what we've
+apparently managed to overlook is that arm_cmn_init_irqs() has in fact
+always been setting the *initial* affinity of all IRQs to CPU 0, not the
+CPU we subsequently choose for event scheduling. Oh dear.
+
+Cc: stable@vger.kernel.org
+Fixes: 0ba64770a2f2 ("perf: Add Arm CMN-600 PMU driver")
+Signed-off-by: Robin Murphy <robin.murphy@arm.com>
+Reviewed-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
+Link: https://lore.kernel.org/r/b12fccba6b5b4d2674944f59e4daad91cd63420b.1747069914.git.robin.murphy@arm.com
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/perf/arm-cmn.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/perf/arm-cmn.c
++++ b/drivers/perf/arm-cmn.c
+@@ -2313,6 +2313,7 @@ static int arm_cmn_probe(struct platform
+
+ cmn->dev = &pdev->dev;
+ cmn->part = (unsigned long)device_get_match_data(cmn->dev);
++ cmn->cpu = cpumask_local_spread(0, dev_to_node(cmn->dev));
+ platform_set_drvdata(pdev, cmn);
+
+ if (cmn->part == PART_CMN600 && has_acpi_companion(cmn->dev)) {
+@@ -2340,7 +2341,6 @@ static int arm_cmn_probe(struct platform
+ if (err)
+ return err;
+
+- cmn->cpu = cpumask_local_spread(0, dev_to_node(cmn->dev));
+ cmn->pmu = (struct pmu) {
+ .module = THIS_MODULE,
+ .attr_groups = arm_cmn_attr_groups,
af_unix-add-dead-flag-to-struct-scm_fp_list.patch
af_unix-fix-garbage-collection-of-embryos-carrying-oob-with-scm_rights.patch
af_unix-fix-uninit-value-in-__unix_walk_scc.patch
+arm64-dts-qcom-sm8350-fix-typo-in-pil_camera_mem-node.patch
+net_sched-hfsc-address-reentrant-enqueue-adding-class-to-eltree-twice.patch
+perf-arm-cmn-fix-req2-snp2-mixup.patch
+perf-arm-cmn-initialise-cmn-cpu-earlier.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
