3411589e85
backport-libbpf-disassociate-section-handler-on-explicit-bpf_.patch backport-libbpf-Use-correct-return-pointer-in-attach_raw_tp.patch backport-libbpf-Use-elf_getshdrnum-instead-of-e_shnum.patch
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 3fd6eebb2d4d10546f0dc89cbc14ad110c4e5717 Mon Sep 17 00:00:00 2001
|
|
From: Andrii Nakryiko <andrii@kernel.org>
|
|
Date: Mon, 27 Mar 2023 11:52:00 -0700
|
|
Subject: [PATCH] libbpf: disassociate section handler on explicit
|
|
bpf_program__set_type() call
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
If user explicitly overrides programs's type with
|
|
bpf_program__set_type() API call, we need to disassociate whatever
|
|
SEC_DEF handler libbpf determined initially based on program's SEC()
|
|
definition, as it's not goind to be valid anymore and could lead to
|
|
crashes and/or confusing failures.
|
|
|
|
Also, fix up bpf_prog_test_load() helper in selftests/bpf, which is
|
|
force-setting program type (even if that's completely unnecessary; this
|
|
is quite a legacy piece of code), and thus should expect auto-attach to
|
|
not work, yet one of the tests explicitly relies on auto-attach for
|
|
testing.
|
|
|
|
Instead, force-set program type only if it differs from the desired one.
|
|
|
|
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230327185202.1929145-2-andrii@kernel.org
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
Signed-off-by: Daniel Müller <deso@posteo.net>
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/libbpf/libbpf/commit/3fd6eebb2d4d10546f0dc89cbc14ad110c4e5717
|
|
---
|
|
src/libbpf.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/libbpf.c b/src/libbpf.c
|
|
index 15737d7..49cd304 100644
|
|
--- a/src/libbpf.c
|
|
+++ b/src/libbpf.c
|
|
@@ -8468,6 +8468,7 @@ int bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type)
|
|
return libbpf_err(-EBUSY);
|
|
|
|
prog->type = type;
|
|
+ prog->sec_def = NULL;
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|