bpf, verifier: Invalidate dynptr slices on skb_ext COW reallocation
Subsystems (4)
PATCH 1/1 bpf, verifier: Invalidate dynptr slices on skb_ext COW reallocation
When bpf_dynptr_from_skb_ext() is invoked with BPF_SKB_EXT_F_CREATE, it calls skb_ext_add(skb, SKB_EXT_BPF). On cloned or shared SKBs, this performs a copy-on-write (COW) reallocation of skb->extensions via skb_ext_maybe_cow(), dropping the reference count on the previous extension buffer and freeing it if the count drops to zero.
However, bpf_is_kfunc_pkt_changing() does not include KF_bpf_dynptr_from_skb_ext. As a result, the BPF verifier skips clear_all_pkt_pointers(), leaving previously obtained PTR_TO_MEM dynptr slices pointing to the old extension buffer marked as valid. A BPF program can subsequently dereference the stale slice pointer, resulting in a Use-After-Free (UAF) read/write on freed slab memory.
Fix this by:
1. Adding KF_bpf_dynptr_from_skb_ext to bpf_is_kfunc_pkt_changing() so that clear_all_pkt_pointers() is executed, invalidating any active dynptr slices across the COW reallocation.
2. Updating __bpf_skb_ext_store_bytes() to use skb_ext_add() instead of skb_ext_find(), ensuring that shared extension buffers are properly COWed before any byte mutations.
--- kernel/bpf/verifier.c | 3 ++- net/core/filter.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +2 -1
@@ -11243,7 +11243,8 @@ static bool is_kfunc_bpf_preempt_enable(struct bpf_kfunc_call_arg_meta *meta)bool bpf_is_kfunc_pkt_changing (struct bpf_kfunc_call_arg_meta *meta) { -return meta->func_id == special_kfunc_list[KF_bpf_xdp_pull_data]; +return meta->func_id == special_kfunc_list[KF_bpf_xdp_pull_data] || + meta->func_id == special_kfunc_list[KF_bpf_dynptr_from_skb_ext]; } static enum kfunc_ptr_arg_type
net/core/filter.c +1 -1
@@ -12290,7 +12290,7 @@ int __bpf_skb_ext_store_bytes(struct sk_buff *skb, u32 offset,if (unlikely (flags))return -EINVAL ; - ext =skb_ext_find (skb,SKB_EXT_BPF ); + ext =skb_ext_add (skb,SKB_EXT_BPF );if (!ext)return -ENOENT ;
Signature · 1 line
2.43.0