From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Nov 2025 11:21:00 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v6.6.117~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=204e362b8678c94453746e3e9bd6a4a440a23412;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	net-sched-act_connmark-handle-errno-on-tcf_idr_check_alloc.patch
---

diff --git a/queue-5.15/net-sched-act_connmark-handle-errno-on-tcf_idr_check_alloc.patch b/queue-5.15/net-sched-act_connmark-handle-errno-on-tcf_idr_check_alloc.patch
new file mode 100644
index 0000000000..0559770d14
--- /dev/null
+++ b/queue-5.15/net-sched-act_connmark-handle-errno-on-tcf_idr_check_alloc.patch
@@ -0,0 +1,35 @@
+From fb07390463c95e6eef254044d6dde050bfb9807a Mon Sep 17 00:00:00 2001
+From: Pedro Tammela <pctammela@mojatatu.com>
+Date: Mon, 27 Feb 2023 12:23:52 -0300
+Subject: net/sched: act_connmark: handle errno on tcf_idr_check_alloc
+
+From: Pedro Tammela <pctammela@mojatatu.com>
+
+commit fb07390463c95e6eef254044d6dde050bfb9807a upstream.
+
+Smatch reports that 'ci' can be used uninitialized.
+The current code ignores errno coming from tcf_idr_check_alloc, which
+will lead to the incorrect usage of 'ci'. Handle the errno as it should.
+
+Fixes: 288864effe33 ("net/sched: act_connmark: transition to percpu stats and rcu")
+Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
+Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
+Reviewed-by: Simon Horman <simon.horman@corigine.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/act_connmark.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/net/sched/act_connmark.c
++++ b/net/sched/act_connmark.c
+@@ -156,6 +156,9 @@ static int tcf_connmark_init(struct net
+ 		nparms->zone = parm->zone;
+ 
+ 		ret = 0;
++	} else {
++		err = ret;
++		goto out_free;
+ 	}
+ 
+ 	err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
diff --git a/queue-5.15/series b/queue-5.15/series
index b017f4fe2f..821a0efb82 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -279,3 +279,4 @@ spi-try-to-get-acpi-gpio-irq-earlier.patch
 edac-altera-handle-ocram-ecc-enable-after-warm-reset.patch
 edac-altera-use-inttest-register-for-ethernet-and-usb-sbe-injection.patch
 isdn-misdn-hfcsusb-fix-memory-leak-in-hfcsusb_probe.patch
+net-sched-act_connmark-handle-errno-on-tcf_idr_check_alloc.patch