]> git.baikalelectronics.ru Git - kernel.git/commit
bpf: Use VM_MAP instead of VM_ALLOC for ringbuf
authorHou Tao <hotforest@gmail.com>
Wed, 2 Feb 2022 06:01:58 +0000 (14:01 +0800)
committerAndrii Nakryiko <andrii@kernel.org>
Thu, 3 Feb 2022 07:15:24 +0000 (23:15 -0800)
commitb9330b6dcbc17e98925024885cf632f8b4937c0f
tree284d9f6552a276acc56f3263694f5b23084fecca
parentbbce9137e7a183a4275db8c83d34a057d3282b01
bpf: Use VM_MAP instead of VM_ALLOC for ringbuf

After commit 2fd3fb0be1d1 ("kasan, vmalloc: unpoison VM_ALLOC pages
after mapping"), non-VM_ALLOC mappings will be marked as accessible
in __get_vm_area_node() when KASAN is enabled. But now the flag for
ringbuf area is VM_ALLOC, so KASAN will complain out-of-bound access
after vmap() returns. Because the ringbuf area is created by mapping
allocated pages, so use VM_MAP instead.

After the change, info in /proc/vmallocinfo also changes from
  [start]-[end]   24576 ringbuf_map_alloc+0x171/0x290 vmalloc user
to
  [start]-[end]   24576 ringbuf_map_alloc+0x171/0x290 vmap user

Fixes: 3360f04918f2 ("bpf: Implement BPF ring buffer and verifier support for it")
Reported-by: syzbot+5ad567a418794b9b5983@syzkaller.appspotmail.com
Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220202060158.6260-1-houtao1@huawei.com
kernel/bpf/ringbuf.c