Skip to content

Commit 80bebeb

Browse files
Yucong Sunanakryiko
authored andcommitted
bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel.
In cb80ddc ("bpf: Convert bpf_preload.ko to use light skeleton.") BPF preload was switched from user mode process to use in-kernel light skeleton instead. However, in the kernel context, early in the boot sequence, the first available FD can start from 0, instead of normally 3 for user mode process. So FDs 0 and 1 are then used for loaded BPF programs and prevent init process from setting up stdin/stdout/stderr on FD 0, 1, and 2 as expected. Before the fix: ls -lah /proc/1/fd/* lrwx------1 root root 64 Feb 23 17:20 /proc/1/fd/0 -> /dev/null lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/1 -> /dev/null lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/2 -> /dev/console lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/6 -> /dev/console lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/7 -> /dev/console After the fix: ls -lah /proc/1/fd/* lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/0 -> /dev/console lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/1 -> /dev/console lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/2 -> /dev/console Fix by closing prog FDs after initialization. struct bpf_prog's themselves are kept alive through direct kernel references taken with bpf_link_get_from_fd(). Fixes: cb80ddc ("bpf: Convert bpf_preload.ko to use light skeleton.") Signed-off-by: Yucong Sun <fallentree@fb.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20220225185923.2535519-1-fallentree@fb.com
1 parent 08d4dba commit 80bebeb

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

kernel/bpf/preload/bpf_preload_kern.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ static int load_skel(void)
5454
err = PTR_ERR(progs_link);
5555
goto out;
5656
}
57+
/* Avoid taking over stdin/stdout/stderr of init process. Zeroing out
58+
* makes skel_closenz() a no-op later in iterators_bpf__destroy().
59+
*/
60+
close_fd(skel->links.dump_bpf_map_fd);
61+
skel->links.dump_bpf_map_fd = 0;
62+
close_fd(skel->links.dump_bpf_prog_fd);
63+
skel->links.dump_bpf_prog_fd = 0;
5764
return 0;
5865
out:
5966
free_links_and_skel();

0 commit comments

Comments
 (0)