6.1-stable patches

added patches:
	bpf-test_run-fix-ctx-leak-in-bpf_prog_test_run_xdp-error-path.patch

diff --git a/queue-6.1/bpf-test_run-fix-ctx-leak-in-bpf_prog_test_run_xdp-error-path.patch b/queue-6.1/bpf-test_run-fix-ctx-leak-in-bpf_prog_test_run_xdp-error-path.patch
new file mode 100644 (file)
index 0000000..e65a12f
--- /dev/null
+++ b/queue-6.1/bpf-test_run-fix-ctx-leak-in-bpf_prog_test_run_xdp-error-path.patch
@@ -0,0 +1,45 @@
+From 7f9ee5fc97e14682e36fe22ae2654c07e4998b82 Mon Sep 17 00:00:00 2001
+From: Shardul Bankar <shardulsb08@gmail.com>
+Date: Tue, 14 Oct 2025 17:30:37 +0530
+Subject: bpf: test_run: Fix ctx leak in bpf_prog_test_run_xdp error path
+
+From: Shardul Bankar <shardulsb08@gmail.com>
+
+commit 7f9ee5fc97e14682e36fe22ae2654c07e4998b82 upstream.
+
+Fix a memory leak in bpf_prog_test_run_xdp() where the context buffer
+allocated by bpf_ctx_init() is not freed when the function returns early
+due to a data size check.
+
+On the failing path:
+  ctx = bpf_ctx_init(...);
+  if (kattr->test.data_size_in - meta_sz < ETH_HLEN)
+      return -EINVAL;
+
+The early return bypasses the cleanup label that kfree()s ctx, leading to a
+leak detectable by kmemleak under fuzzing. Change the return to jump to the
+existing free_ctx label.
+
+Fixes: fe9544ed1a2e ("bpf: Support specifying linear xdp packet data size for BPF_PROG_TEST_RUN")
+Reported-by: BPF Runtime Fuzzer (BRF)
+Signed-off-by: Shardul Bankar <shardulsb08@gmail.com>
+Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
+Acked-by: Jiri Olsa <jolsa@kernel.org>
+Acked-by: Daniel Borkmann <daniel@iogearbox.net>
+Link: https://patch.msgid.link/20251014120037.1981316-1-shardulsb08@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/bpf/test_run.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bpf/test_run.c
++++ b/net/bpf/test_run.c
+@@ -1344,7 +1344,7 @@ int bpf_prog_test_run_xdp(struct bpf_pro
+               goto free_ctx;
+ 
+       if (kattr->test.data_size_in - meta_sz < ETH_HLEN)
+-              return -EINVAL;
++              goto free_ctx;
+ 
+       data = bpf_test_init(kattr, linear_sz, max_linear_sz, headroom, tailroom);
+       if (IS_ERR(data)) {

diff --git a/queue-6.1/series b/queue-6.1/series
index ce950af1ed36bd36a00b0bad5fee08d3fdc43c49..36058388d1a9c3ccf74b3b5f39a52ea7e8a3b5a6 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -69,3 +69,4 @@ can-j1939-make-j1939_session_activate-fail-if-device.patch
 asoc-amd-yc-add-quirk-for-honor-magicbook-x16-2025.patch
 asoc-fsl_sai-add-missing-registers-to-cache-default.patch
 scsi-sg-fix-occasional-bogus-elapsed-time-that-excee.patch
+bpf-test_run-fix-ctx-leak-in-bpf_prog_test_run_xdp-error-path.patch