Skip to content

Commit a41b99e

Browse files
bandariintel-lab-lkp
authored andcommitted
bpf, test_run: fix alignment problem in bpf_prog_test_run_skb()
Recently, we got a syzkaller problem because of aarch64 alignment fault if KFENCE enabled. When the size from user bpf program is an odd number, like 399, 407, etc, it will cause skb shard info's alignment access, as seen below: BUG: KFENCE: use-after-free read in __skb_clone+0x23c/0x2a0 net/core/skbuff.c:1032 Use-after-free read at 0xffff6254fffac077 (in kfence-torvalds#213): __lse_atomic_add arch/arm64/include/asm/atomic_lse.h:26 [inline] arch_atomic_add arch/arm64/include/asm/atomic.h:28 [inline] arch_atomic_inc include/linux/atomic-arch-fallback.h:270 [inline] atomic_inc include/asm-generic/atomic-instrumented.h:241 [inline] __skb_clone+0x23c/0x2a0 net/core/skbuff.c:1032 skb_clone+0xf4/0x214 net/core/skbuff.c:1481 ____bpf_clone_redirect net/core/filter.c:2433 [inline] bpf_clone_redirect+0x78/0x1c0 net/core/filter.c:2420 bpf_prog_d3839dd9068ceb51+0x80/0x330 bpf_dispatcher_nop_func include/linux/bpf.h:728 [inline] bpf_test_run+0x3c0/0x6c0 net/bpf/test_run.c:53 bpf_prog_test_run_skb+0x638/0xa7c net/bpf/test_run.c:594 bpf_prog_test_run kernel/bpf/syscall.c:3148 [inline] __do_sys_bpf kernel/bpf/syscall.c:4441 [inline] __se_sys_bpf+0xad0/0x1634 kernel/bpf/syscall.c:4381 kfence-torvalds#213: 0xffff6254fffac000-0xffff6254fffac196, size=407, cache=kmalloc-512 allocated by task 15074 on cpu 0 at 1342.585390s: kmalloc include/linux/slab.h:568 [inline] kzalloc include/linux/slab.h:675 [inline] bpf_test_init.isra.0+0xac/0x290 net/bpf/test_run.c:191 bpf_prog_test_run_skb+0x11c/0xa7c net/bpf/test_run.c:512 bpf_prog_test_run kernel/bpf/syscall.c:3148 [inline] __do_sys_bpf kernel/bpf/syscall.c:4441 [inline] __se_sys_bpf+0xad0/0x1634 kernel/bpf/syscall.c:4381 __arm64_sys_bpf+0x50/0x60 kernel/bpf/syscall.c:4381 To fix the problem, we round up allocations with kmalloc_size_roundup() so that build_skb()'s use of kize() is always alignment and no special handling of the memory is needed by KFENCE. Fixes: 1cf1cae ("bpf: introduce BPF_PROG_TEST_RUN command") Signed-off-by: Baisong Zhong <[email protected]>
1 parent 6fbda10 commit a41b99e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/bpf/test_run.c

+1
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@ static void *bpf_test_init(const union bpf_attr *kattr, u32 user_size,
774774
if (user_size > size)
775775
return ERR_PTR(-EMSGSIZE);
776776

777+
size = kmalloc_size_roundup(size);
777778
data = kzalloc(size + headroom + tailroom, GFP_USER);
778779
if (!data)
779780
return ERR_PTR(-ENOMEM);

0 commit comments

Comments
 (0)