5.15-stable patches

added patches:
	arm64-dts-qcom-sm8350-fix-typo-in-pil_camera_mem-node.patch
	net_sched-hfsc-address-reentrant-enqueue-adding-class-to-eltree-twice.patch

diff --git a/queue-5.15/arm64-dts-qcom-sm8350-fix-typo-in-pil_camera_mem-node.patch b/queue-5.15/arm64-dts-qcom-sm8350-fix-typo-in-pil_camera_mem-node.patch
new file mode 100644 (file)
index 0000000..60c2a78
--- /dev/null
+++ b/queue-5.15/arm64-dts-qcom-sm8350-fix-typo-in-pil_camera_mem-node.patch
@@ -0,0 +1,34 @@
+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
+@@ -240,7 +240,7 @@
+                       no-map;
+               };
+ 
+-              pil_camera_mem: mmeory@85200000 {
++              pil_camera_mem: memory@85200000 {
+                       reg = <0x0 0x85200000 0x0 0x500000>;
+                       no-map;
+               };

diff --git a/queue-5.15/net_sched-hfsc-address-reentrant-enqueue-adding-class-to-eltree-twice.patch b/queue-5.15/net_sched-hfsc-address-reentrant-enqueue-adding-class-to-eltree-twice.patch
new file mode 100644 (file)
index 0000000..ca1de9a
--- /dev/null
+++ b/queue-5.15/net_sched-hfsc-address-reentrant-enqueue-adding-class-to-eltree-twice.patch
@@ -0,0 +1,85 @@
+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.
+@@ -1038,6 +1043,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);
+@@ -1575,7 +1582,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)

diff --git a/queue-5.15/series b/queue-5.15/series
index 01306e2e8e8e5b2b2cce0d95cfbf238438a4e40a..251d5b34e4953beb44f9ba3cf8dcf83775706ccb 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -189,3 +189,5 @@ drm-i915-gvt-fix-unterminated-string-initialization-warning.patch
 x86-its-fix-undefined-reference-to-cpu_wants_rethunk_at.patch
 smb-client-fix-use-after-free-in-cifs_fill_dirent.patch
 smb-client-reset-all-search-buffer-pointers-when-releasing-buffer.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