bpf: Reject arena frees below the arena base
Subsystems (3)
v2 cover bpf: Reject arena frees below the arena base
bpf_arena_free_pages() can be called with a scalar arena address. The runtime reconstructs a full user address from the arena base and the low 32 bits before returning the range to the arena free tree. A scalar one page below the arena base can otherwise produce an out-of-domain free-tree offset and make a later allocation return an address below the arena mapping.
Patch 1 rejects frees whose reconstructed full user address is below user_vm_start. Patch 2 adds verifier_arena coverage for the scalar-below-base case.
Changes in v2:
- Add Reviewed-by tags from Emil Tsalapatis.
- Remove the empty inline asm from the selftest.
v1: https://lore.kernel.org/bpf/[email protected]/
Yiyang Chen (2):
bpf: Reject arena frees below the arena base selftests/bpf: Cover scalar arena frees below the base
kernel/bpf/arena.c | 2 ++ tools/testing/selftests/bpf/progs/verifier_arena.c | 40 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-)
base-commit: 1d91ea01185656ac3ee63c5f9f6f8bde3c746b3d
Signature · 1 line
2.34.1
PATCH v2 1/2 bpf: Reject arena frees below the arena base
bpf_arena_free_pages() accepts scalar arena addresses. The runtime masks the address to the low 32 bits and reconstructs a full user address from the arena base before returning the range to the arena free tree.
When the scalar value is below the low 32 bits of the arena base, full_uaddr falls below user_vm_start. The existing upper-end clipping then turns this into an out-of-range free-tree offset. A later allocation can reuse that offset and return an address below the arena mapping.
Reject such frees before computing the clipped range.
--- kernel/bpf/arena.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/arena.c +2 -0
@@ -853,6 +853,8 @@ static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt, uaddr &=PAGE_MASK ; kaddr =bpf_arena_get_kern_vm_start (arena) + uaddr; full_uaddr =clear_lo32 (arena->user_vm_start) + uaddr; +if (full_uaddr < arena->user_vm_start) +return ; uaddr_end =min (arena->user_vm_end, full_uaddr + (page_cnt <<PAGE_SHIFT ));if (full_uaddr >= uaddr_end)return ;
Signature · 1 line
2.34.1
PATCH v2 2/2 selftests/bpf: Cover scalar arena frees below the base
In reply to Yiyang ChenAdd a verifier_arena case that fills a two-page arena, calls bpf_arena_free_pages() with a scalar address one page below the arena base, and then verifies that another allocation is still rejected.
Before the runtime guard, the invalid free can repopulate the free tree with an out-of-domain offset and the final allocation succeeds.
--- tools/testing/selftests/bpf/progs/verifier_arena.c | 40 +++++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/progs/verifier_arena.c +35 -5
@@ -12,15 +12,17 @@#define private (name) SEC(".bss." #name) __hidden __attribute__((aligned(8))) +#ifdef __TARGET_ARCH_arm64 +#define ARENA_VM_START ((1ull << 32) | (~0u - __PAGE_SIZE * 2 + 1)) +#else +#define ARENA_VM_START ((1ull << 44) | (~0u - __PAGE_SIZE * 2 + 1)) +#endif +struct { __uint(type, BPF_MAP_TYPE_ARENA); __uint(map_flags, BPF_F_MMAPABLE); __uint(max_entries, 2); /* arena of two pages close to 32-bit boundary*/ -#ifdef __TARGET_ARCH_arm64 - __ulong(map_extra, (1ull << 32) | (~0u - __PAGE_SIZE * 2 + 1)); /* start of mmap() region */ -#else - __ulong(map_extra, (1ull << 44) | (~0u - __PAGE_SIZE * 2 + 1)); /* start of mmap() region */ -#endif + __ulong(map_extra, ARENA_VM_START); /* start of mmap() region */ } arena SEC(".maps");SEC ("socket" )
@@ -93,6 +95,34 @@ int basic_alloc1(void *ctx)return 0 ; } +SEC("syscall") +__success __retval(0) +int free_scalar_below_arena(void *ctx) +{ + void __arena *page1, *page2, *page3; +__u64 bad_addr =ARENA_VM_START - __PAGE_SIZE; + + page1 =bpf_arena_alloc_pages (&arena,NULL ,1 ,NUMA_NO_NODE ,0 ); +if (!page1) +return 1 ; + + page2 =bpf_arena_alloc_pages (&arena,NULL ,1 ,NUMA_NO_NODE ,0 ); +if (!page2) +return 2 ; + + page3 =bpf_arena_alloc_pages (&arena,NULL ,1 ,NUMA_NO_NODE ,0 ); +if (page3) +return 3 ; + + bpf_arena_free_pages(&arena, (void __arena *)bad_addr, 1); + + page3 =bpf_arena_alloc_pages (&arena,NULL ,1 ,NUMA_NO_NODE ,0 ); +if (page3) +return 4 ; + +return 0 ; +} + SEC("socket") __success __retval(0) int basic_alloc2_nosleep(void *ctx)
Signature · 1 line
2.34.1
[email protected]
AI reviewRe: [PATCH bpf-next v2 2/2] selftests/bpf: Cover scalar arena frees below the base
This test covers a memory-safety issue where bpf_arena_free_pages() accepts a scalar address below the arena base and repopulates the free tree with an out-of-domain offset, so a later allocation…
Quoted 11 lines
selftests/bpf: Cover scalar arena frees below the base
Add a
verifier_arenacase that fills a two-page arena, callsbpf_arena_free_pages()with a scalar address one page below the arena base, and then verifies that another allocation is still rejected.Before the runtime guard, the invalid free can repopulate the free tree with an out-of-domain offset and the final allocation succeeds.
Reviewed-by Emil Tsalapatis <[email protected]>Signed-off-by Yiyang Chen <[email protected]>
This test covers a memory-safety issue where bpf_arena_free_pages() accepts a scalar address below the arena base and repopulates the free tree with an out-of-domain offset, so a later allocation can return an address below the arena mapping.
The clipping logic in arena_free_pages() that only bounded the upper end (uaddr_end = min(...)) without checking full_uaddr >= arena->user_vm_start was introduced in commit 317460317a02a. The paired kernel fix a6ceda1f4a47 also carries that tag.
Should this include:
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/29583169394
This series was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Quoted 8 lines · On Fri, 17 Jul 2026 12:53:46 +0000 you wrote:
bpf_arena_free_pages()can be called with a scalar arena address. The runtime reconstructs a full user address from the arena base and the low 32 bits before returning the range to the arena free tree. A scalar one page below the arena base can otherwise produce an out-of-domain free-tree offset and make a later allocation return an address below the arena mapping.[...]
Here is the summary with links:
- [bpf-next,v2,1/2] bpf: Reject arena frees below the arena base
https://git.kernel.org/bpf/bpf-next/c/b5a71cb2db6d - [bpf-next,v2,2/2] selftests/bpf: Cover scalar arena frees below the base https://git.kernel.org/bpf/bpf-next/c/770b62a6d389
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html