Skip to content

Commit e23bb04

Browse files
guidosarducciborkmann
authored andcommitted
bpf: Fix sysfs export of empty BTF section
If BTF data is missing or removed from the ELF section it is still exported via sysfs as a zero-length file: root@OpenWrt:/# ls -l /sys/kernel/btf/vmlinux -r--r--r-- 1 root root 0 Jul 18 02:59 /sys/kernel/btf/vmlinux Moreover, reads from this file succeed and leak kernel data: root@OpenWrt:/# hexdump -C /sys/kernel/btf/vmlinux|head -10 000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 000cc0 00 00 00 00 00 00 00 00 00 00 00 00 80 83 b0 80 |................| 000cd0 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 000ce0 00 00 00 00 00 00 00 00 00 00 00 00 57 ac 6e 9d |............W.n.| 000cf0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 002650 00 00 00 00 00 00 00 10 00 00 00 01 00 00 00 01 |................| 002660 80 82 9a c4 80 85 97 80 81 a9 51 68 00 00 00 02 |..........Qh....| 002670 80 25 44 dc 80 85 97 80 81 a9 50 24 81 ab c4 60 |.%D.......P$...`| This situation was first observed with kernel 5.4.x, cross-compiled for a MIPS target system. Fix by adding a sanity-check for export of zero-length data sections. Fixes: 341dfcf ("btf: expose BTF info through sysfs") Signed-off-by: Tony Ambardar <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: John Fastabend <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/b38db205a66238f70823039a8c531535864eaac5.1600417359.git.Tony.Ambardar@gmail.com
1 parent ba2fd56 commit e23bb04

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/bpf/sysfs_btf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ static struct kobject *btf_kobj;
3030

3131
static int __init btf_vmlinux_init(void)
3232
{
33-
if (!__start_BTF)
33+
bin_attr_btf_vmlinux.size = __stop_BTF - __start_BTF;
34+
35+
if (!__start_BTF || bin_attr_btf_vmlinux.size == 0)
3436
return 0;
3537

3638
btf_kobj = kobject_create_and_add("btf", kernel_kobj);
3739
if (!btf_kobj)
3840
return -ENOMEM;
3941

40-
bin_attr_btf_vmlinux.size = __stop_BTF - __start_BTF;
41-
4242
return sysfs_create_bin_file(btf_kobj, &bin_attr_btf_vmlinux);
4343
}
4444

0 commit comments

Comments
 (0)