From: Greg Kroah-Hartman Date: Thu, 15 Jan 2026 15:05:51 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v6.6.121~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=689d741375ebccdc21331b49fbd828d8bca23065;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 0000000000..e65a12fd43 --- /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 +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 + +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 +Signed-off-by: Martin KaFai Lau +Acked-by: Jiri Olsa +Acked-by: Daniel Borkmann +Link: https://patch.msgid.link/20251014120037.1981316-1-shardulsb08@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + 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 ce950af1ed..36058388d1 100644 --- 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