bpf: Add oversize check before call kvcalloc()
PATCH 1/1 bpf: Add oversize check before call kvcalloc()
Commit 7661809d493b ("mm: don't allow oversized kvmalloc() calls") add the oversize check. When the allocation is larger than what kmalloc() supports, the following warning triggered:
WARNING: CPU: 0 PID: 8408 at mm/util.c:597 kvmalloc_node+0x108/0x110 mm/util.c:597 Modules linked in: CPU: 0 PID: 8408 Comm: syz-executor221 Not tainted 5.14.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:kvmalloc_node+0x108/0x110 mm/util.c:597 Call Trace: kvmalloc include/linux/mm.h:806 [inline] kvmalloc_array include/linux/mm.h:824 [inline] kvcalloc include/linux/mm.h:829 [inline] check_btf_line kernel/bpf/verifier.c:9925 [inline] check_btf_info kernel/bpf/verifier.c:10049 [inline] bpf_check+0xd634/0x150d0 kernel/bpf/verifier.c:13759 bpf_prog_load kernel/bpf/syscall.c:2301 [inline] __sys_bpf+0x11181/0x126e0 kernel/bpf/syscall.c:4587 __do_sys_bpf kernel/bpf/syscall.c:4691 [inline] __se_sys_bpf kernel/bpf/syscall.c:4689 [inline] __x64_sys_bpf+0x78/0x90 kernel/bpf/syscall.c:4689 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/verifier.c +2 -0
@@ -9912,6 +9912,8 @@ static int check_btf_line(struct bpf_verifier_env *env, nr_linfo = attr->line_info_cnt;if (!nr_linfo)return 0 ; +if (nr_linfo *sizeof (struct bpf_line_info ) >INT_MAX ) +return -EINVAL ; rec_size = attr->line_info_rec_size; if (rec_size < MIN_BPF_LINEINFO_SIZE ||
Signature · 1 line
2.17.1
Quoted 37 lines · Bixuan Cui
Commit
7661809d493b("mm: don't allow oversizedkvmalloc()calls") add the oversize check. When the allocation is larger than whatkmalloc()supports, the following warning triggered:WARNING: CPU: 0 PID: 8408 at mm/util.c:597 kvmalloc_node+0x108/0x110 mm/util.c:597 Modules linked in: CPU: 0 PID: 8408 Comm: syz-executor221 Not tainted 5.14.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:kvmalloc_node+0x108/0x110 mm/util.c:597 Call Trace: kvmalloc include/linux/mm.h:806 [inline] kvmalloc_array include/linux/mm.h:824 [inline] kvcalloc include/linux/mm.h:829 [inline] check_btf_line kernel/bpf/verifier.c:9925 [inline] check_btf_info kernel/bpf/verifier.c:10049 [inline] bpf_check+0xd634/0x150d0 kernel/bpf/verifier.c:13759 bpf_prog_load kernel/bpf/syscall.c:2301 [inline] __sys_bpf+0x11181/0x126e0 kernel/bpf/syscall.c:4587 __do_sys_bpf kernel/bpf/syscall.c:4691 [inline] __se_sys_bpf kernel/bpf/syscall.c:4689 [inline] __x64_sys_bpf+0x78/0x90 kernel/bpf/syscall.c:4689 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xaeReported-by [email protected]Signed-off-by Bixuan Cui <[email protected]>--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int check_btf_line(struct bpf_verifier_env *env, · line 9916
Quoted 5 lines
kernel/bpf/verifier.c +2
-0@@ -9912,6 +9912,8 @@ static int check_btf_line(struct bpf_verifier_env *env, nr_linfo = attr->line_info_cnt;if (!nr_linfo)return 0 ; +if (nr_linfo *sizeof (struct bpf_line_info ) >INT_MAX ) +return -EINVAL ;
I might be missing something, but on 64-bit architecture this can't overflow (because u32 is multiplied by fixed small sizeof()). And on 32-bit architecture if it overflows you won't catch it... So did you mean to do:
if (nr_lifo > INT_MAX / sizeof(struct bpf_line_info))
return -EINVAL;
?
Quoted 6 lines
kernel/bpf/verifier.c +0
-1rec_size = attr->line_info_rec_size; if (rec_size < MIN_BPF_LINEINFO_SIZE || --2.17.1
Quoted 15 lines · Andrii Nakryiko
kernel/bpf/verifier.c static int check_btf_line(struct bpf_verifier_env *env, · line 9916
Quoted 10 lines
kernel/bpf/verifier.c +2
-0@@ -9912,6 +9912,8 @@ static int check_btf_line(struct bpf_verifier_env *env, nr_linfo = attr->line_info_cnt;if (!nr_linfo)return 0 ; +if (nr_linfo *sizeof (struct bpf_line_info ) >INT_MAX ) +return -EINVAL ;I might be missing something, but on 64-bit architecture this can't overflow (because u32 is multiplied by fixed small
sizeof()). And on 32-bit architecture if it overflows you won't catch it... So did you mean to do:
Quoted 4 lines
if (
nr_lifo>INT_MAX/sizeof(struct bpf_line_info))return -EINVAL;?
On 64-bit architecture, the value of INT_MAX may be equal to the 32-bit.
I get the same question: https://stackoverflow.com/questions/9257065/int-max-in-32-bit-vs-64-bit-environment
And 'if (nr_lifo > INT_MAX / sizeof(struct bpf_line_info))' is correct on 32-bit architecture ;)
Thanks,
Bixuan Cui