bpf: copy BPF token from main program to subprograms
Subsystems (3)
Eduard Zingerman
maintainerv3 cover bpf: copy BPF token from main program to subprograms
bpf_jit_subprogs() omits aux->token when it creates a struct bpf_prog_aux instances for a subprograms.
This means that for programs loaded via BPF token (i.e., from a non-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:
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/[email protected]/T/
v2: https://lore.kernel.org/bpf/[email protected]/T/
---
Eduard Zingerman (2):
bpf: copy BPF token from main program to subprograms
selftests/bpf: verify kallsyms entries for token-loaded subprograms
kernel/bpf/fixups.c | 1 + tools/testing/selftests/bpf/Makefile | 1 + tools/testing/selftests/bpf/prog_tests/token.c | 83 +++++++++++++++++++++- .../selftests/bpf/prog_tests/unpriv_bpf_disabled.c | 21 +----- tools/testing/selftests/bpf/progs/token_kallsyms.c | 19 +++++ tools/testing/selftests/bpf/sysctl_helpers.c | 26 +++++++ tools/testing/selftests/bpf/sysctl_helpers.h | 7 ++ 7 files changed, 135 insertions(+), 23 deletions(-)
---
base-commit: 71b500afd2f7336f5b6c6026f2af546fc079be26
change-id: 20260414-subprog-token-fix-96c29ffa7e12
Eduard Zingerman
maintainerPATCH v3 1/2 bpf: copy BPF token from main program to subprograms
bpf_jit_subprogs() copies various fields from the main program's aux to each subprogram's aux, but omits the BPF token. This causes bpf_prog_kallsyms_add() to fail for subprograms loaded via BPF token, as bpf_token_capable() falls back to capable() in init_user_ns when token is NULL.
Copy prog->aux->token to func[i]->aux->token so that subprograms inherit the same capability delegation as the main program.
--- kernel/bpf/fixups.c | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/fixups.c +1 -0
@@ -1110,6 +1110,7 @@ int bpf_jit_subprogs(struct bpf_verifier_env *env) func[i]->aux->exception_cb = env->subprog_info[i].is_exception_cb; func[i]->aux->changes_pkt_data = env->subprog_info[i].changes_pkt_data; func[i]->aux->might_sleep = env->subprog_info[i].might_sleep; + func[i]->aux->token = prog->aux->token;if (!i) func[i]->aux->exception_boundary = env->seen_exception;
Signature · 1 line
2.53.0
Eduard Zingerman
maintainerPATCH v3 2/2 selftests/bpf: verify kallsyms entries for token-loaded subprograms
In reply to Eduard ZingermanAdd a test that loads an XDP program with a global subprogram using a BPF token from a user namespace, then verifies that both the main program and the subprogram appear in /proc/kallsyms.
This exercises the bpf_prog_kallsyms_add() path for subprograms and would 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 the following sysctl variables have to be set to zero:
- /proc/sys/kernel/perf_event_paranoid
- /proc/sys/kernel/kptr_restrict
Set these variables using sysctl_set() utility function extracted from unpriv_bpf_disabled.c to a separate c/header.
Since the test modifies global system state, mark it as serial.
--- tools/testing/selftests/bpf/Makefile | 1 + tools/testing/selftests/bpf/prog_tests/token.c | 83 +++++++++++++++++++++- .../selftests/bpf/prog_tests/unpriv_bpf_disabled.c | 21 +----- tools/testing/selftests/bpf/progs/token_kallsyms.c | 19 +++++ tools/testing/selftests/bpf/sysctl_helpers.c | 26 +++++++ tools/testing/selftests/bpf/sysctl_helpers.h | 7 ++ 6 files changed, 134 insertions(+), 23 deletions(-)
tools/testing/selftests/bpf/Makefile +1 -0
@@ -750,6 +750,7 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ btf_helpers.c \ cap_helpers.c \ unpriv_helpers.c \ + sysctl_helpers.c \ netlink_helpers.c \ jit_disasm_helpers.c \ io_helpers.c \
tools/testing/selftests/bpf/prog_tests/token.c +80 -3
115 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/unpriv_bpf_disabled.c +1 -20
@@ -8,6 +8,7 @@#include "cap_helpers.h" #include "bpf_util.h" +#include "sysctl_helpers.h" /* Using CAP_LAST_CAP is risky here, since it can get pulled in from * an old /usr/include/linux/capability.h and be < CAP_BPF; as a result
@@ -36,26 +37,6 @@ static void process_perfbuf(void *ctx, int cpu, void *data, __u32 len) got_perfbuf_val = *(__u32 *)data; } -static int sysctl_set (const char *sysctl_path,char *old_val,const char *new_val) -{ -int ret =0 ; -FILE *fp; - - fp =fopen (sysctl_path,"r+" ); -if (!fp) -return -errno; -if (old_val &&fscanf (fp,"%s" , old_val) <=0 ) { - ret = -ENOENT ; - }else if (!old_val ||strcmp (old_val, new_val) !=0 ) { -fseek (fp,0 ,SEEK_SET ); -if (fprintf (fp,"%s" , new_val) <0 ) - ret = -errno; - } -fclose (fp); - -return ret; -} -static void test_unpriv_bpf_disabled_positive (struct test_unpriv_bpf_disabled *skel,__u32 prog_id,int prog_fd,int perf_fd,char **map_paths,int *map_fds)
tools/testing/selftests/bpf/progs/token_kallsyms.c new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" +#include <bpf/bpf_helpers.h> + +char _license[] SEC("license") = "GPL"; + +__weak +int token_ksym_subprog (void ) +{ +return 0 ; +} + +SEC("xdp") +int xdp_main (struct xdp_md *xdp) +{ +return token_ksym_subprog (); +}
tools/testing/selftests/bpf/sysctl_helpers.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdio.h> +#include <errno.h> +#include <string.h> + +#include "sysctl_helpers.h" + +int sysctl_set (const char *sysctl_path,char *old_val,const char *new_val) +{ +int ret =0 ; +FILE *fp; + + fp =fopen (sysctl_path,"r+" ); +if (!fp) +return -errno; +if (old_val &&fscanf (fp,"%s" , old_val) <=0 ) { + ret = -ENOENT ; + }else if (!old_val ||strcmp (old_val, new_val) !=0 ) { +fseek (fp,0 ,SEEK_SET ); +if (fprintf (fp,"%s" , new_val) <0 ) + ret = -errno; + } +fclose (fp); + +return ret; +}
tools/testing/selftests/bpf/sysctl_helpers.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SYSCTL_HELPERS_H +#define __SYSCTL_HELPERS_H + +int sysctl_set (const char *sysctl_path,char *old_val,const char *new_val); + +#endif
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCH bpf-next v3 2/2] selftests/bpf: verify kallsyms entries for token-loaded subprograms
Sashiko AI review found 1 potential issue(s): - [Medium] Unchecked return values of `sysctl_set()` in `serial_test_token()` can lead to confusing test failures. --
Sashiko AI review found 1 potential issue(s):
- [Medium] Unchecked return values of sysctl_set() in serial_test_token() can lead to confusing test failures. --
commit e7dc629b9f37dc08742ff9bbddeaaf65c1e34956
Author: Eduard Zingerman <[email protected]>
selftests/bpf: verify kallsyms entries for token-loaded subprograms
This commit adds a test to verify that both the main XDP program and its global subprogram appear in /proc/kallsyms when loaded using a user namespace BPF token. It also introduces a sysctl_set utility to configure system parameters needed to read kallsyms.
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/token.c +0
-0
[ ... ]
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/token.c +1
-0@@ -1194,4 +1252,23 @@ void test_token(void)subtest_userns (&opts, userns_bpf_token_info); } +if (test__start_subtest ("obj_priv_prog_kallsyms" )) {
tools/testing/selftests/bpf/prog_tests/token.c void test_token(void) · line 1265
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/token.c +10
-0+char perf_paranoid_orig[32 ] = {}; +char kptr_restrict_orig[32 ] = {}; +struct bpffs_opts opts = { + .cmds =bit (BPF_BTF_LOAD ) |bit (BPF_PROG_LOAD ), + .progs =bit (BPF_PROG_TYPE_XDP ), + .attachs = ~0ULL , + }; + +sysctl_set ("/proc/sys/kernel/perf_event_paranoid" , perf_paranoid_orig,"0" ); +sysctl_set ("/proc/sys/kernel/kptr_restrict" , kptr_restrict_orig,"0" );
Should the return values of these sysctl_set calls be checked?
If the test is executed in an environment where these sysctls are read-only or inaccessible (such as inside a container), sysctl_set will silently fail.
This would cause load_kallsyms_local to read zeroed addresses because kptr_restrict wasn't successfully disabled, resulting in confusing test failures later at ASSERT_TRUE instead of catching the setup failure early.
Would it be better to wrap these with ASSERT_OK?
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/token.c +8
-0+ +subtest_userns (&opts, userns_obj_priv_prog_kallsyms); + +if (perf_paranoid_orig[0 ]) +sysctl_set ("/proc/sys/kernel/perf_event_paranoid" ,NULL , perf_paranoid_orig); +if (kptr_restrict_orig[0 ]) +sysctl_set ("/proc/sys/kernel/kptr_restrict" ,NULL , kptr_restrict_orig); + } }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Eduard Zingerman
maintainerRe: [PATCH bpf-next v3 2/2] selftests/bpf: verify kallsyms entries for token-loaded subprograms
Quoted 39 lines · On Wed, 2026-04-15 at 19:17 +0000, [email protected] wrote:
Sashiko AI review found 1 potential issue(s):
- [Medium] Unchecked return values ofsysctl_set()inserial_test_token()can lead to confusing test failures. --commit
e7dc629b9f37dc08742ff9bbddeaaf65c1e34956
Author: Eduard Zingerman <[email protected]>selftests/bpf: verify kallsyms entries for token-loaded subprograms
This commit adds a test to verify that both the main XDP program and its global subprogram appear in
/proc/kallsymswhen loaded using a user namespace BPF token. It also introduces asysctl_setutility to configure system parameters needed to read kallsyms.Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/token.c +0
-0[ ... ]
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/token.c +1
-0@@ -1194,4 +1252,23 @@ void test_token(void)subtest_userns (&opts, userns_bpf_token_info); } +if (test__start_subtest ("obj_priv_prog_kallsyms" )) {tools/testing/selftests/bpf/prog_tests/token.c void test_token(void) · line 1265
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/token.c +10
-0+char perf_paranoid_orig[32 ] = {}; +char kptr_restrict_orig[32 ] = {}; +struct bpffs_opts opts = { + .cmds =bit (BPF_BTF_LOAD ) |bit (BPF_PROG_LOAD ), + .progs =bit (BPF_PROG_TYPE_XDP ), + .attachs = ~0ULL , + }; + +sysctl_set ("/proc/sys/kernel/perf_event_paranoid" , perf_paranoid_orig,"0" ); +sysctl_set ("/proc/sys/kernel/kptr_restrict" , kptr_restrict_orig,"0" );Should the return values of these
sysctl_setcalls be checked?
Quoted 8 lines
If the test is executed in an environment where these sysctls are read-only or inaccessible (such as inside a container),
sysctl_setwill silently fail.This would cause
load_kallsyms_localto read zeroed addresses becausekptr_restrictwasn't successfully disabled, resulting in confusing test failures later atASSERT_TRUEinstead of catching the setup failure early.Would it be better to wrap these with
ASSERT_OK?
Makes sense.
Quoted 9 lines
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/token.c +8
-0+ +subtest_userns (&opts, userns_obj_priv_prog_kallsyms); + +if (perf_paranoid_orig[0 ]) +sysctl_set ("/proc/sys/kernel/perf_event_paranoid" ,NULL , perf_paranoid_orig); +if (kptr_restrict_orig[0 ]) +sysctl_set ("/proc/sys/kernel/kptr_restrict" ,NULL , kptr_restrict_orig); + } }