From: Greg Kroah-Hartman Date: Tue, 9 Jul 2024 10:51:58 +0000 (+0200) Subject: 6.9-stable patches X-Git-Tag: v6.1.98~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5da4b8e7f5f5dd3d7b7ab586f6ba996156b95bf;p=thirdparty%2Fkernel%2Fstable-queue.git 6.9-stable patches added patches: libbpf-don-t-close-1-in-multi-uprobe-feature-detector.patch --- diff --git a/queue-6.9/libbpf-don-t-close-1-in-multi-uprobe-feature-detector.patch b/queue-6.9/libbpf-don-t-close-1-in-multi-uprobe-feature-detector.patch new file mode 100644 index 00000000000..7d9da6ff0dc --- /dev/null +++ b/queue-6.9/libbpf-don-t-close-1-in-multi-uprobe-feature-detector.patch @@ -0,0 +1,35 @@ +From 7d0b3953f6d832daec10a0d76e2d4db405768a8b Mon Sep 17 00:00:00 2001 +From: Andrii Nakryiko +Date: Wed, 29 May 2024 16:12:12 -0700 +Subject: libbpf: don't close(-1) in multi-uprobe feature detector + +From: Andrii Nakryiko + +commit 7d0b3953f6d832daec10a0d76e2d4db405768a8b upstream. + +Guard close(link_fd) with extra link_fd >= 0 check to prevent close(-1). + +Detected by Coverity static analysis. + +Fixes: 04d939a2ab22 ("libbpf: detect broken PID filtering logic for multi-uprobe") +Signed-off-by: Andrii Nakryiko +Acked-by: Jiri Olsa +Link: https://lore.kernel.org/r/20240529231212.768828-1-andrii@kernel.org +Signed-off-by: Alexei Starovoitov +Signed-off-by: Greg Kroah-Hartman +--- + tools/lib/bpf/features.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/tools/lib/bpf/features.c ++++ b/tools/lib/bpf/features.c +@@ -393,7 +393,8 @@ static int probe_uprobe_multi_link(int t + err = -errno; /* close() can clobber errno */ + + if (link_fd >= 0 || err != -EBADF) { +- close(link_fd); ++ if (link_fd >= 0) ++ close(link_fd); + close(prog_fd); + return 0; + } diff --git a/queue-6.9/series b/queue-6.9/series index 21b4ee8bbe4..e3e34f8cef9 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -194,3 +194,4 @@ alsa-ump-set-default-protocol-when-not-given-explici.patch drm-amdgpu-silence-ubsan-warning.patch hwmon-dell-smm-add-dell-g15-5511-to-fan-control-whit.patch null_blk-do-not-allow-runt-zone-with-zone-capacity-s.patch +libbpf-don-t-close-1-in-multi-uprobe-feature-detector.patch