4b66332c57
Upgrade libbpf 0.4.0-1 with CVE patches from libbpf 0.3-2+deb11u1: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/patch/?id=d0d382f95a9270dcf803539d6781d6bd67e3f5b2 https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/patch/?id=93c660ca40b5d2f7c1b1626e955a8e9fa30e0749 Refer to: https://nvd.nist.gov/vuln/detail/CVE-2022-3534 https://nvd.nist.gov/vuln/detail/CVE-2022-3606 https://security-tracker.debian.org/tracker/DLA-4137-1 https://www.tenable.com/plugins/nessus/234828 TestPlan: PASS: downloader PASS: build-pkgs PASS: build-image PASS: install on SX-lab Closes-bug: #2111567 Change-Id: I31949a9e2050f69d15021ad560721c033f7e60e6 Signed-off-by: Iulian Mocanu <iulian.mocanu@windriver.com>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From e13c23b7db2d12cf4adf138f992eeca7f9488bee Mon Sep 17 00:00:00 2001
|
|
From: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Date: Wed, 12 Oct 2022 10:23:53 +0800
|
|
Subject: [PATCH 2/2] libbpf: Fix null-pointer dereference in
|
|
find_prog_by_sec_insn()
|
|
|
|
When there are no program sections, obj->programs is left unallocated,
|
|
and find_prog_by_sec_insn()'s search lands on &obj->programs[0] == NULL,
|
|
and will cause null-pointer dereference in the following access to
|
|
prog->sec_idx.
|
|
|
|
Guard the search with obj->nr_programs similar to what's being done in
|
|
__bpf_program__iter() to prevent null-pointer access from happening.
|
|
|
|
Fixes: db2b8b06423c ("libbpf: Support CO-RE relocations for multi-prog sections")
|
|
Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Link: https://lore.kernel.org/bpf/20221012022353.7350-4-shung-hsi.yu@suse.com
|
|
Signed-off-by: Iulian Mocanu <iulian.mocanu@windriver.com>
|
|
---
|
|
src/libbpf.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
Index: libbpf-0.4.0/src/libbpf.c
|
|
===================================================================
|
|
--- libbpf-0.4.0.orig/src/libbpf.c
|
|
+++ libbpf-0.4.0/src/libbpf.c
|
|
@@ -3724,6 +3724,9 @@ static struct bpf_program *find_prog_by_
|
|
int l = 0, r = obj->nr_programs - 1, m;
|
|
struct bpf_program *prog;
|
|
|
|
+ if (!obj->nr_programs)
|
|
+ return NULL;
|
|
+
|
|
while (l < r) {
|
|
m = l + (r - l + 1) / 2;
|
|
prog = &obj->programs[m];
|