Changes in sysctl_helpers.h

eb0d6d97c27c29cd7392c8fd74f46edf7dff7ec2 - Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Sat, 18 Apr 2026 00:58:22 +0200

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfPull bpf fixes from Alexei Starovoitov: "Most of the diff stat comes from Xu Kuohai's fix to emit ENDBR/BTI, since all JITs had to be touched to move constant blinding out and pass bpf_verifier_env in. - Fix use-after-free in arena_vm_close on fork (Alexei Starovoitov) - Dissociate struct_ops program with map if map_update fails (Amery Hung) - Fix out-of-range and off-by-one bugs in arm64 JIT (Daniel Borkmann) - Fix precedence bug in convert_bpf_ld_abs alignment check (Daniel Borkmann) - Fix arg tracking for imprecise/multi-offset in BPF_ST/STX insns (Eduard Zingerman) - Copy token from main to subprogs to fix missing kallsyms (Eduard Zingerman) - Prevent double close and leak of btf objects in libbpf (Jiri Olsa) - Fix af_unix null-ptr-deref in sockmap (Michal Luczaj) - Fix NULL deref in map_kptr_match_type for scalar regs (Mykyta Yatsenko) - Avoid unnecessary IPIs. Remove redundant bpf_flush_icache() in arm64 and riscv JITs (Puranjay Mohan) - Fix out of bounds access. Validate node_id in arena_alloc_pages() (Puranjay Mohan) - Reject BPF-to-BPF calls and callbacks in arm32 JIT (Puranjay Mohan) - Refactor all JITs to pass bpf_verifier_env to emit ENDBR/BTI for indirect jump targets on x86-64, arm64 JITs (Xu Kuohai) - Allow UTF-8 literals in bpf_bprintf_prepare() (Yihan Ding)"* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: (32 commits) bpf, arm32: Reject BPF-to-BPF calls and callbacks in the JIT bpf: Dissociate struct_ops program with map if map_update fails bpf: Validate node_id in arena_alloc_pages() libbpf: Prevent double close and leak of btf objects selftests/bpf: cover UTF-8 trace_printk output bpf: allow UTF-8 literals in bpf_bprintf_prepare() selftests/bpf: Reject scalar store into kptr slot bpf: Fix NULL deref in map_kptr_match_type for scalar regs bpf: Fix precedence bug in convert_bpf_ld_abs alignment check bpf, arm64: Emit BTI for indirect jump target bpf, x86: Emit ENDBR for indirect jump targets bpf: Add helper to detect indirect jump targets bpf: Pass bpf_verifier_env to JIT bpf: Move constants blinding out of arch-specific JITs bpf, sockmap: Take state lock for af_unix iter bpf, sockmap: Fix af_unix null-ptr-deref in proto update selftests/bpf: Extend bpf_iter_unix to attempt deadlocking bpf, sockmap: Fix af_unix iter deadlock bpf, sockmap: Annotate af_unix sock:: Sk_state data-races selftests/bpf: verify kallsyms entries for token-loaded subprograms ... List of files: /linux/tools/testing/selftests/bpf/sysctl_helpers.h

9d8e92e15f75794c469f586a2c47fab58f093a3a - Merge branch 'bpf-copy-bpf-token-from-main-program-to-subprograms'

Thu, 16 Apr 2026 01:46:47 +0200

Merge branch 'bpf-copy-bpf-token-from-main-program-to-subprograms'Eduard Zingerman says:====================bpf: copy BPF token from main program to subprogramsbpf_jit_subprogs() omits aux->token when it creates a structbpf_prog_aux instances for a subprograms.This means that for programs loaded via BPF token (i.e., from anon-init user namespace), subprograms fail the bpf_token_capable()check in bpf_prog_kallsyms_add() and don't appear in /proc/kallsyms.Which in-turn makes it impossible to freplace such subprograms.Changelog:v3 -> v4:- check sysctl_set calls for errors (sashiko).v2 -> v3:- mark selftest as serial (sashiko).v1 -> v2:- target bpf-next tree (fixups.c) instead of bpf tree (verifier.c).v1: https://lore.kernel.org/bpf/20260414-subprog-token-fix-v1-0-5b1a38e01546@gmail.com/T/v2: https://lore.kernel.org/bpf/20260414-subprog-token-fix-v2-0-59146c31f6f1@gmail.com/T/v3: https://lore.kernel.org/bpf/20260415-subprog-token-fix-v3-0-6fefe1d51646@gmail.com/T/====================Link: https://patch.msgid.link/20260415-subprog-token-fix-v4-0-9bd000e8b068@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux/tools/testing/selftests/bpf/sysctl_helpers.h

969fb456ffb43d87894a295dbe6a0a722691552a - selftests/bpf: verify kallsyms entries for token-loaded subprograms

Wed, 15 Apr 2026 22:03:56 +0200

selftests/bpf: verify kallsyms entries for token-loaded subprogramsAdd a test that loads an XDP program with a global subprogram using aBPF token from a user namespace, then verifies that both the mainprogram and the subprogram appear in /proc/kallsyms.This exercises the bpf_prog_kallsyms_add() path for subprograms andwould have caught the missing aux->token copy in bpf_jit_subprogs().load_kallsyms_local() filters out kallsyms with zero addresses.For a process with limited capabilities to read kallsym addresses thefollowing sysctl variables have to be set to zero:- /proc/sys/kernel/perf_event_paranoid- /proc/sys/kernel/kptr_restrictSet these variables using sysctl_set() utility function extracted fromunpriv_bpf_disabled.c to a separate c/header.Since the test modifies global system state, mark it as serial.Signed-off-by: Eduard Zingerman Link: https://lore.kernel.org/r/20260415-subprog-token-fix-v4-2-9bd000e8b068@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux/tools/testing/selftests/bpf/sysctl_helpers.h