libbpf: fix feature detectors when using token_fd
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: fix feature detectors when using token_fd
Adjust union bpf_attr size passed to kernel in two feature-detecting functions to take into account prog_token_fd field.
Libbpf is avoiding memset()'ing entire union bpf_attr by only using minimal set of bpf_attr's fields. Two places have been missed when wiring BPF token support in libbpf's feature detection logic.
Fix them trivially.
--- tools/lib/bpf/bpf.c | 2 +- tools/lib/bpf/features.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/bpf.c +1 -1
@@ -105,7 +105,7 @@ int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size, int attempts)*/ int probe_memcg_account (int token_fd) { - const size_t attr_sz = offsetofend(union bpf_attr, attach_btf_obj_fd); + const size_t attr_sz = offsetofend(union bpf_attr, prog_token_fd);struct bpf_insn insns[] = {BPF_EMIT_CALL (BPF_FUNC_ktime_get_coarse_ns),BPF_EXIT_INSN (),
tools/lib/bpf/features.c +1 -1
@@ -22,7 +22,7 @@ int probe_fd(int fd)static int probe_kern_prog_name (int token_fd) { - const size_t attr_sz = offsetofend(union bpf_attr, prog_name); + const size_t attr_sz = offsetofend(union bpf_attr, prog_token_fd);struct bpf_insn insns[] = {BPF_MOV64_IMM (BPF_REG_0 ,0 ),BPF_EXIT_INSN (),
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Mon, 13 May 2024 11:08:03 -0700 you wrote:
Adjust
union bpf_attrsize passed to kernel in two feature-detecting functions to take into accountprog_token_fdfield.Libbpf is avoiding memset()'ing entire
union bpf_attrby only using minimal set of bpf_attr's fields. Two places have been missed when wiring BPF token support in libbpf's feature detection logic.[...]
Here is the summary with links:
- libbpf: fix feature detectors when using token_fd
https://git.kernel.org/bpf/bpf/c/1de27bba6d50
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html