bpf: propagate ref_obj_id for dynptr slices of refcounted dynptrs
PATCH 1/1 bpf: propagate ref_obj_id for dynptr slices of refcounted dynptrs
bpf_dynptr_slice() and bpf_dynptr_slice_rdwr() return PTR_TO_MEM slices that carry only dynptr_id but not ref_obj_id. When a refcounted dynptr (ringbuf, file) is released via submit or discard, unmark_stack_slots_dynptr() invalidates state through release_reference(ref_obj_id). Because the slice has no ref_obj_id, it survives the release and remains usable as live PTR_TO_MEM.
This allows post-release reads and writes through the stale slice. A BPF program can reserve a ringbuf dynptr, obtain a slice, submit the dynptr, then continue writing through the slice into the already-submitted ringbuf entry.
Set ref_obj_id on the returned slice register when the source dynptr is refcounted, so release_reference() properly invalidates it.
The original comment stated "packet slices are not refcounted" which was correct for the initial packet-only use case, but bpf_dynptr_slice is a generic kfunc also used with refcounted ringbuf and file dynptrs.
BPF verifier incorrectly accepts post-release slice access:
19: (85) call bpf_ringbuf_discard_dynptr ; dynptr released
20: (15) if r6 == 0x0 goto pc+6 ; R6=rdonly_mem(sz=64) ← stale
21: (71) r1 = *(u8 *)(r6 +0) ← reads freed memory--- kernel/bpf/verifier.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
kernel/bpf/verifier.c +2 -5
@@ -14071,11 +14071,8 @@ static int check_special_kfunc(struct bpf_verifier_env *env, struct bpf_kfunc_careturn -EFAULT ; } regs[BPF_REG_0 ].dynptr_id = meta->initialized_dynptr.id; - -/* we don't need to set BPF_REG_0's ref obj id -* because packet slices are not refcounted (see -* dynptr_type_refcounted) -*/ +if (dynptr_type_refcounted (meta->initialized_dynptr.type)) + regs[BPF_REG_0 ].ref_obj_id = meta->initialized_dynptr.ref_obj_id; }else {return 0 ; }
Signature · 1 line
2.43.0
Quoted 37 lines · Qi Tang
bpf_dynptr_slice()andbpf_dynptr_slice_rdwr()returnPTR_TO_MEMslices that carry onlydynptr_idbut notref_obj_id. When a refcounted dynptr (ringbuf, file) is released via submit or discard,unmark_stack_slots_dynptr()invalidates state throughrelease_reference(ref_obj_id). Because the slice has noref_obj_id, it survives the release and remains usable as livePTR_TO_MEM.This allows post-release reads and writes through the stale slice. A BPF program can reserve a ringbuf dynptr, obtain a slice, submit the dynptr, then continue writing through the slice into the already-submitted ringbuf entry.
Set
ref_obj_idon the returned slice register when the source dynptr is refcounted, sorelease_reference()properly invalidates it.The original comment stated "packet slices are not refcounted" which was correct for the initial packet-only use case, but
bpf_dynptr_sliceis a generic kfunc also used with refcounted ringbuf and file dynptrs.BPF verifier incorrectly accepts post-release slice access:
19: (85) call bpf_ringbuf_discard_dynptr ; dynptr released 20: (15) if r6 == 0x0 goto pc+6 ; R6=rdonly_mem(sz=64) ← stale 21: (71) r1 = *(u8 *)(r6 +0) ← reads freed memoryFixes 66e3a13e7c2c ("bpf: Add bpf_dynptr_slice and bpf_dynptr_slice_rdwr")Signed-off-by Qi Tang <[email protected]>--- kernel/bpf/verifier.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int check_special_kfunc(struct bpf_verifier_env *env, struct bpf_kfunc_ca · line 14075
Quoted 10 lines
kernel/bpf/verifier.c +2
-5@@ -14071,11 +14071,8 @@ static int check_special_kfunc(struct bpf_verifier_env *env, struct bpf_kfunc_careturn -EFAULT ; } regs[BPF_REG_0 ].dynptr_id = meta->initialized_dynptr.id; - -/* we don't need to set BPF_REG_0's ref obj id -* because packet slices are not refcounted (see -* dynptr_type_refcounted) -*/ +if (dynptr_type_refcounted (meta->initialized_dynptr.type)) + regs[BPF_REG_0 ].ref_obj_id = meta->initialized_dynptr.ref_obj_id;
Currently dynptr object relation tracking is buggy and this patch fixes a part of it. There is another parallel effort in refactoring it
[0]
BTW. It will be good to have a selftest for this type of patch.
Quoted 7 lines
kernel/bpf/verifier.c +0
-1}else {return 0 ; } --2.43.0
Thanks for the review and the pointer to Amery's series. Noted on the selftest — will make sure to include one and run the test suite before submitting next time.
Qi Tang