bpf: Refactor dynptr mutability tracking
PATCH v3 1/1 bpf: Refactor dynptr mutability tracking
Redefine dynptr mutability and fix inconsistency in the verifier and kfunc signatures. Dynptr mutability is at two levels. The first is the bpf_dynptr structure and the second is the memory the dynptr points to. The verifer currently tracks the mutability of the bpf_dynptr struct through helper and kfunc prototypes, where "const struct bpf_dynptr *" means the structure itself is immutable. The second level is tracked in upper bit of bpf_dynptr->size in runtime and is not changed in this patch.
There are two type of inconsistency in the verfier regarding the mutability of the bpf_dynptr struct. First, there are many existing kfuncs whose prototypes are wrong. For example, bpf_dynptr_adjust() mutates a dynptr's start and offset but marks the argument as a const pointer. At the same time many other kfuncs that does not mutate the dynptr but mark themselves as mutable. Second, the verifier currently does not honor the const qualifier in kfunc prototypes as it determines whether tagging the arg_type with MEM_RDONLY or not based on the register state.
Since all the verifier care is to prevent CONST_PTR_TO_DYNPTR from being destroyed in callback and global subprogram, redefine the mutability at the bpf_dynptr level to just bpf_dynptr_kern->data. Then, explicitly prohibit passing CONST_PTR_TO_DYNPTR to an argument tagged with MEM_UNINIT or OBJ_RELEASE. The mutability of a dynptr's view is not really interesting so drop MEM_RDONLY annotation for dynptr from the helpers and kfuncs. Plus, if the mutability of the entire bpf_dynptr were to be done correctly, it would kill the bpf_dynptr_adjust() usage in callback and global subporgram.
Implementation wise
- First, make sure all kfunc arg are correctly tagged: Tag the dynptr argument of bpf_dynptr_file_discard() with OBJ_RELEASE.
- Then, in process_dynptr_func(), make sure CONST_PTR_TO_DYNPTR cannot be passed to argument tagged with MEM_UNINIT or OBJ_RELEASE. For MEM_UNINIT, it is already checked by is_dynptr_reg_valid_uninit(). For OBJ_RELEASE, check against OBJ_RELEASE instead of MEM_RDONLY and drop a now identical check in unmark_stack_slots_dynptr().
- Remove the mutual exclusive check between MEM_UNINIT and MEM_RDONLY, but don't add a MEM_UNINIT and OBJ_RELEASE version as it is obviously wrong.
Note that while this patch stops following the C semantic for the mutability of bpf_dynptr, the prototype of kfuncs are still fixed to maintain the correct C semantics in the implementation. Adding or removing the const qualifier does not break backward compatibility. In addition, fix kfuncs dropping the const qualifier when casting the opaque bpf_dynptr to bpf_dynptr_kern.
In test_kfunc_dynptr_param.c, initialize dynptr to 0 to avoid -Wuninitialized-const-pointer warning.
---
v1 -> v2
- Fix incorrect flags masking in process_dynptr_func() (Mykyta)
- Add const to dst when casting const bpf_dynptr to bpf_dynptr_kern (Mykyta)
--- fs/bpf_fs_kfuncs.c | 2 +- fs/verity/measure.c | 4 +- include/linux/bpf.h | 8 +-- kernel/bpf/btf.c | 2 +- kernel/bpf/helpers.c | 36 +++++----- kernel/bpf/verifier.c | 70 +++++-------------- kernel/trace/bpf_trace.c | 22 +++--- tools/testing/selftests/bpf/bpf_kfuncs.h | 8 +-- .../selftests/bpf/progs/dynptr_success.c | 6 +- .../bpf/progs/test_kfunc_dynptr_param.c | 9 +-- 10 files changed, 65 insertions(+), 102 deletions(-)
fs/bpf_fs_kfuncs.c +1 -1
@@ -200,7 +200,7 @@ int bpf_set_dentry_xattr_locked(struct dentry *dentry, const char *name__str, const struct bpf_dynptr *value_p, int flags) { -struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p; +const struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p;struct inode *inode =d_inode (dentry);const void *value;u32 value_len;
fs/verity/measure.c +2 -2
@@ -118,9 +118,9 @@ __bpf_kfunc_start_defs();* * Return: 0 on success, a negative value on error. */ -__bpf_kfunc int bpf_get_fsverity_digest(struct file *file, struct bpf_dynptr *digest_p) +__bpf_kfunc int bpf_get_fsverity_digest(struct file *file, const struct bpf_dynptr *digest_p) { -struct bpf_dynptr_kern *digest_ptr = (struct bpf_dynptr_kern *)digest_p; +const struct bpf_dynptr_kern *digest_ptr = (struct bpf_dynptr_kern *)digest_p;const struct inode *inode =file_inode (file);u32 dynptr_sz =__bpf_dynptr_size (digest_ptr);struct fsverity_digest *arg;
include/linux/bpf.h +4 -4
@@ -3620,8 +3620,8 @@ static inline int bpf_fd_reuseport_array_update_elem(struct bpf_map *map,struct bpf_key *bpf_lookup_user_key (s32 serial,u64 flags);struct bpf_key *bpf_lookup_system_key (u64 id);void bpf_key_put (struct bpf_key *bkey); -int bpf_verify_pkcs7_signature (struct bpf_dynptr *data_p, -struct bpf_dynptr *sig_p, +int bpf_verify_pkcs7_signature (const struct bpf_dynptr *data_p, +const struct bpf_dynptr *sig_p,struct bpf_key *trusted_keyring);#else
@@ -3639,8 +3639,8 @@ static inline void bpf_key_put(struct bpf_key *bkey) { } -static inline int bpf_verify_pkcs7_signature (struct bpf_dynptr *data_p, -struct bpf_dynptr *sig_p, +static inline int bpf_verify_pkcs7_signature (const struct bpf_dynptr *data_p, +const struct bpf_dynptr *sig_p,struct bpf_key *trusted_keyring) {return -EOPNOTSUPP ;
kernel/bpf/btf.c +1 -1
@@ -7973,7 +7973,7 @@ int btf_prepare_func_args(struct bpf_verifier_env *env, int subprog)bpf_log (log,"arg#%d has invalid combination of tags\n" , i);return -EINVAL ; } - sub->args[i].arg_type =ARG_PTR_TO_DYNPTR |MEM_RDONLY ; + sub->args[i].arg_type =ARG_PTR_TO_DYNPTR ;continue ; }if (tags &ARG_TAG_TRUSTED ) {
kernel/bpf/helpers.c +18 -18
@@ -1929,7 +1929,7 @@ static const struct bpf_func_proto bpf_dynptr_read_proto = { .ret_type = RET_INTEGER, .arg1_type = ARG_PTR_TO_UNINIT_MEM, .arg2_type = ARG_CONST_SIZE_OR_ZERO, - .arg3_type = ARG_PTR_TO_DYNPTR | MEM_RDONLY, + .arg3_type = ARG_PTR_TO_DYNPTR, .arg4_type = ARG_ANYTHING, .arg5_type = ARG_ANYTHING, };
@@ -1986,7 +1986,7 @@ static const struct bpf_func_proto bpf_dynptr_write_proto = { .func = bpf_dynptr_write, .gpl_only = false, .ret_type = RET_INTEGER, - .arg1_type = ARG_PTR_TO_DYNPTR | MEM_RDONLY, + .arg1_type = ARG_PTR_TO_DYNPTR, .arg2_type = ARG_ANYTHING, .arg3_type = ARG_PTR_TO_MEM | MEM_RDONLY, .arg4_type = ARG_CONST_SIZE_OR_ZERO,
@@ -2029,7 +2029,7 @@ static const struct bpf_func_proto bpf_dynptr_data_proto = { .func = bpf_dynptr_data, .gpl_only = false, .ret_type = RET_PTR_TO_DYNPTR_MEM_OR_NULL, - .arg1_type = ARG_PTR_TO_DYNPTR | MEM_RDONLY, + .arg1_type = ARG_PTR_TO_DYNPTR, .arg2_type = ARG_ANYTHING, .arg3_type = ARG_CONST_ALLOC_SIZE_OR_ZERO, };
@@ -3057,7 +3057,7 @@ __bpf_kfunc void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr *p, u64 offset,return bpf_dynptr_slice (p, offset, buffer__nullable, buffer__szk); } -__bpf_kfunc int bpf_dynptr_adjust(const struct bpf_dynptr *p, u64 start, u64 end) +__bpf_kfunc int bpf_dynptr_adjust(struct bpf_dynptr *p, u64 start, u64 end) {struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;u64 size;
@@ -3078,14 +3078,14 @@ __bpf_kfunc int bpf_dynptr_adjust(const struct bpf_dynptr *p, u64 start, u64 end __bpf_kfunc bool bpf_dynptr_is_null(const struct bpf_dynptr *p) { -struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p; +const struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;return !ptr->data; } __bpf_kfunc bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *p) { -struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p; +const struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;if (!ptr->data)return false;
@@ -3095,7 +3095,7 @@ __bpf_kfunc bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *p) __bpf_kfunc u64 bpf_dynptr_size(const struct bpf_dynptr *p) { -struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p; +const struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;if (!ptr->data)return -EINVAL ;
@@ -3107,7 +3107,7 @@ __bpf_kfunc int bpf_dynptr_clone(const struct bpf_dynptr *p, struct bpf_dynptr *clone__uninit) {struct bpf_dynptr_kern *clone = (struct bpf_dynptr_kern *)clone__uninit; -struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p; +const struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;if (!ptr->data) {bpf_dynptr_set_null (clone);
@@ -3130,11 +3130,11 @@ __bpf_kfunc int bpf_dynptr_clone(const struct bpf_dynptr *p,* Copies data from source dynptr to destination dynptr. * Returns 0 on success; negative error, otherwise. */ -__bpf_kfunc int bpf_dynptr_copy(struct bpf_dynptr *dst_ptr, u64 dst_off, -struct bpf_dynptr *src_ptr,u64 src_off,u64 size) +__bpf_kfunc int bpf_dynptr_copy(const struct bpf_dynptr *dst_ptr, u64 dst_off, +const struct bpf_dynptr *src_ptr,u64 src_off,u64 size) { -struct bpf_dynptr_kern *dst = (struct bpf_dynptr_kern *)dst_ptr; -struct bpf_dynptr_kern *src = (struct bpf_dynptr_kern *)src_ptr; +const struct bpf_dynptr_kern *dst = (struct bpf_dynptr_kern *)dst_ptr; +const struct bpf_dynptr_kern *src = (struct bpf_dynptr_kern *)src_ptr;void *src_slice, *dst_slice;char buf[256 ];u64 off;
@@ -3185,9 +3185,9 @@ __bpf_kfunc int bpf_dynptr_copy(struct bpf_dynptr *dst_ptr, u64 dst_off,* at @offset with the constant byte @val. * Returns 0 on success; negative error, otherwise. */ -__bpf_kfunc int bpf_dynptr_memset(struct bpf_dynptr *p, u64 offset, u64 size, u8 val) +__bpf_kfunc int bpf_dynptr_memset(const struct bpf_dynptr *p, u64 offset, u64 size, u8 val) { -struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p; +const struct bpf_dynptr_kern *ptr = (struct bpf_dynptr_kern *)p;u64 chunk_sz, write_off;char buf[256 ];void * slice;
@@ -4199,13 +4199,13 @@ __bpf_kfunc void bpf_key_put(struct bpf_key *bkey)* * Return: 0 on success, a negative value on error. */ -__bpf_kfunc int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_p, -struct bpf_dynptr *sig_p, +__bpf_kfunc int bpf_verify_pkcs7_signature(const struct bpf_dynptr *data_p, +const struct bpf_dynptr *sig_p,struct bpf_key *trusted_keyring) {#ifdef CONFIG_SYSTEM_DATA_VERIFICATION -struct bpf_dynptr_kern *data_ptr = (struct bpf_dynptr_kern *)data_p; -struct bpf_dynptr_kern *sig_ptr = (struct bpf_dynptr_kern *)sig_p; +const struct bpf_dynptr_kern *data_ptr = (struct bpf_dynptr_kern *)data_p; +const struct bpf_dynptr_kern *sig_ptr = (struct bpf_dynptr_kern *)sig_p;const void *data, *sig;u32 data_len, sig_len;int ret;
kernel/bpf/verifier.c +19 -51
132 lines not on this page · raw message
kernel/trace/bpf_trace.c +11 -11
@@ -3397,12 +3397,12 @@ typedef int (*copy_fn_t)(void *dst, const void *src, u32 size, struct task_struc* direct calls into all the specific callback implementations * (copy_user_data_sleepable, copy_user_data_nofault, and so on) */ -static __always_inline int __bpf_dynptr_copy_str(struct bpf_dynptr *dptr, u64 doff, u64 size, +static __always_inline int __bpf_dynptr_copy_str(const struct bpf_dynptr *dptr, u64 doff, u64 size,const void *unsafe_src,copy_fn_t str_copy_fn,struct task_struct *tsk) { -struct bpf_dynptr_kern *dst; +const struct bpf_dynptr_kern *dst;u64 chunk_sz, off;void *dst_slice;int cnt, err;
@@ -3438,7 +3438,7 @@ static __always_inline int __bpf_dynptr_copy(const struct bpf_dynptr *dptr, u64 u64 size, const void *unsafe_src, copy_fn_t copy_fn, struct task_struct *tsk) { - struct bpf_dynptr_kern *dst; + const struct bpf_dynptr_kern *dst;void *dst_slice;char buf[256 ];u64 off, chunk_sz;
@@ -3539,49 +3539,49 @@ __bpf_kfunc int bpf_send_signal_task(struct task_struct *task, int sig, enum pidreturn bpf_send_signal_common (sig, type, task, value); } -__bpf_kfunc int bpf_probe_read_user_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_probe_read_user_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign) {return __bpf_dynptr_copy (dptr, off, size, (const void __force *)unsafe_ptr__ign, copy_user_data_nofault,NULL ); } -__bpf_kfunc int bpf_probe_read_kernel_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_probe_read_kernel_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void *unsafe_ptr__ign) {return __bpf_dynptr_copy (dptr, off, size, unsafe_ptr__ign, copy_kernel_data_nofault,NULL ); } -__bpf_kfunc int bpf_probe_read_user_str_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_probe_read_user_str_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign) {return __bpf_dynptr_copy_str (dptr, off, size, (const void __force *)unsafe_ptr__ign, copy_user_str_nofault,NULL ); } -__bpf_kfunc int bpf_probe_read_kernel_str_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_probe_read_kernel_str_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void *unsafe_ptr__ign) {return __bpf_dynptr_copy_str (dptr, off, size, unsafe_ptr__ign, copy_kernel_str_nofault,NULL ); } -__bpf_kfunc int bpf_copy_from_user_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_copy_from_user_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign) {return __bpf_dynptr_copy (dptr, off, size, (const void __force *)unsafe_ptr__ign, copy_user_data_sleepable,NULL ); } -__bpf_kfunc int bpf_copy_from_user_str_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_copy_from_user_str_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign) {return __bpf_dynptr_copy_str (dptr, off, size, (const void __force *)unsafe_ptr__ign, copy_user_str_sleepable,NULL ); } -__bpf_kfunc int bpf_copy_from_user_task_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_copy_from_user_task_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign,struct task_struct *tsk) {
@@ -3589,7 +3589,7 @@ __bpf_kfunc int bpf_copy_from_user_task_dynptr(struct bpf_dynptr *dptr, u64 off, copy_user_data_sleepable, tsk); } -__bpf_kfunc int bpf_copy_from_user_task_str_dynptr(struct bpf_dynptr *dptr, u64 off, +__bpf_kfunc int bpf_copy_from_user_task_str_dynptr(const struct bpf_dynptr *dptr, u64 off,u64 size,const void __user *unsafe_ptr__ign,struct task_struct *tsk) {
tools/testing/selftests/bpf/bpf_kfuncs.h +4 -4
@@ -40,7 +40,7 @@ extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, __u64 offset,extern void *bpf_dynptr_slice_rdwr (const struct bpf_dynptr *ptr,__u64 offset,void *buffer,__u64 buffer__szk) __ksym__weak ; -extern int bpf_dynptr_adjust(const struct bpf_dynptr *ptr, __u64 start, __u64 end) __ksym __weak; +extern int bpf_dynptr_adjust(struct bpf_dynptr *ptr, __u64 start, __u64 end) __ksym __weak; extern bool bpf_dynptr_is_null(const struct bpf_dynptr *ptr) __ksym __weak; extern bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *ptr) __ksym __weak; extern __u64 bpf_dynptr_size(const struct bpf_dynptr *ptr) __ksym __weak;
@@ -70,13 +70,13 @@ extern void *bpf_rdonly_cast(const void *obj, __u32 btf_id) __ksym __weak; extern int bpf_get_file_xattr(struct file *file, const char *name, struct bpf_dynptr *value_ptr) __ksym; -extern int bpf_get_fsverity_digest(struct file *file, struct bpf_dynptr *digest_ptr) __ksym; +extern int bpf_get_fsverity_digest(struct file *file, const struct bpf_dynptr *digest_ptr) __ksym;extern struct bpf_key *bpf_lookup_user_key (__s32 serial,__u64 flags) __ksym;extern struct bpf_key *bpf_lookup_system_key (__u64 id) __ksym; extern void bpf_key_put(struct bpf_key *key) __ksym; -extern int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_ptr, - struct bpf_dynptr *sig_ptr, +extern int bpf_verify_pkcs7_signature(const struct bpf_dynptr *data_ptr, + const struct bpf_dynptr *sig_ptr, struct bpf_key *trusted_keyring) __ksym;struct dentry ;
tools/testing/selftests/bpf/progs/dynptr_success.c +3 -3
@@ -914,7 +914,7 @@ void *user_ptr;char expected_str[384 ];__u32 test_len[7 ] = {0 /* placeholder */ ,0 ,1 ,2 ,255 ,256 ,257 }; -typedef int (*bpf_read_dynptr_fn_t )(struct bpf_dynptr *dptr,u64 off, +typedef int (*bpf_read_dynptr_fn_t )(const struct bpf_dynptr *dptr,u64 off,u64 size,const void *unsafe_ptr);/* Returns the offset just before the end of the maximum sized xdp fragment.
@@ -1106,7 +1106,7 @@ int test_copy_from_user_str_dynptr(void *ctx)return 0 ; } -static int bpf_copy_data_from_user_task (struct bpf_dynptr *dptr,u64 off, +static int bpf_copy_data_from_user_task (const struct bpf_dynptr *dptr,u64 off,u64 size,const void *unsafe_ptr) {struct task_struct *task =bpf_get_current_task_btf ();
@@ -1114,7 +1114,7 @@ static int bpf_copy_data_from_user_task(struct bpf_dynptr *dptr, u64 off,return bpf_copy_from_user_task_dynptr (dptr, off, size, unsafe_ptr, task); } -static int bpf_copy_data_from_user_task_str (struct bpf_dynptr *dptr,u64 off, +static int bpf_copy_data_from_user_task_str (const struct bpf_dynptr *dptr,u64 off,u64 size,const void *unsafe_ptr) {struct task_struct *task =bpf_get_current_task_btf ();
tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c +2 -7
@@ -11,12 +11,7 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include "bpf_misc.h" - -extern struct bpf_key *bpf_lookup_system_key (__u64 id) __ksym; -extern void bpf_key_put(struct bpf_key *key) __ksym; -extern int bpf_verify_pkcs7_signature (struct bpf_dynptr *data_ptr, -struct bpf_dynptr *sig_ptr, - struct bpf_key *trusted_keyring) __ksym; +#include "bpf_kfuncs.h" struct { __uint(type, BPF_MAP_TYPE_RINGBUF);
@@ -38,7 +33,7 @@ SEC("?lsm.s/bpf") __failure __msg("cannot pass in dynptr at an offset=-8")int BPF_PROG (not_valid_dynptr ,int cmd,union bpf_attr *attr,unsigned int size,bool kernel) { -unsigned long val; +unsigned long val =0 ;return bpf_verify_pkcs7_signature ((struct bpf_dynptr *)&val, (struct bpf_dynptr *)&val,NULL );
Signature · 1 line
2.52.0
Quoted 50 lines · Amery Hung
Redefine dynptr mutability and fix inconsistency in the verifier and kfunc signatures. Dynptr mutability is at two levels. The first is the
bpf_dynptrstructure and the second is the memory the dynptr points to. The verifer currently tracks the mutability of thebpf_dynptrstruct through helper and kfunc prototypes, where "const structbpf_dynptr*" means the structure itself is immutable. The second level is tracked in upper bit ofbpf_dynptr->sizein runtime and is not changed in this patch.There are two type of inconsistency in the verfier regarding the mutability of the
bpf_dynptrstruct. First, there are many existing kfuncs whose prototypes are wrong. For example,bpf_dynptr_adjust()mutates a dynptr's start and offset but marks the argument as a const pointer. At the same time many other kfuncs that does not mutate the dynptr but mark themselves as mutable. Second, the verifier currently does not honor the const qualifier in kfunc prototypes as it determines whether tagging thearg_typewithMEM_RDONLYor not based on the register state.Since all the verifier care is to prevent
CONST_PTR_TO_DYNPTRfrom being destroyed in callback and global subprogram, redefine the mutability at thebpf_dynptrlevel to justbpf_dynptr_kern->data. Then, explicitly prohibit passingCONST_PTR_TO_DYNPTRto an argument tagged withMEM_UNINITorOBJ_RELEASE. The mutability of a dynptr's view is not really interesting so dropMEM_RDONLYannotation for dynptr from the helpers and kfuncs. Plus, if the mutability of the entirebpf_dynptrwere to be done correctly, it would kill thebpf_dynptr_adjust()usage in callback and global subporgram.Implementation wise
- First, make sure all kfunc arg are correctly tagged: Tag the dynptr argument of
bpf_dynptr_file_discard()withOBJ_RELEASE.
- Then, inprocess_dynptr_func(), make sureCONST_PTR_TO_DYNPTRcannot be passed to argument tagged withMEM_UNINITorOBJ_RELEASE. ForMEM_UNINIT, it is already checked byis_dynptr_reg_valid_uninit(). ForOBJ_RELEASE, check againstOBJ_RELEASEinstead ofMEM_RDONLYand drop a now identical check inunmark_stack_slots_dynptr().
- Remove the mutual exclusive check betweenMEM_UNINITandMEM_RDONLY, but don't add aMEM_UNINITandOBJ_RELEASEversion as it is obviously wrong.Note that while this patch stops following the C semantic for the mutability of
bpf_dynptr, the prototype of kfuncs are still fixed to maintain the correct C semantics in the implementation. Adding or removing the const qualifier does not break backward compatibility. In addition, fix kfuncs dropping the const qualifier when casting the opaquebpf_dynptrtobpf_dynptr_kern.
Quoted 6 lines
In
test_kfunc_dynptr_param.c, initialize dynptr to 0 to avoid -Wuninitialized-const-pointer warning.Signed-off-by Amery Hung <[email protected]>---
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Quoted 10 lines · On Tue, 14 Apr 2026 12:10:14 -0700 you wrote:
Redefine dynptr mutability and fix inconsistency in the verifier and kfunc signatures. Dynptr mutability is at two levels. The first is the
bpf_dynptrstructure and the second is the memory the dynptr points to. The verifer currently tracks the mutability of thebpf_dynptrstruct through helper and kfunc prototypes, where "const structbpf_dynptr*" means the structure itself is immutable. The second level is tracked in upper bit ofbpf_dynptr->sizein runtime and is not changed in this patch.[...]
Here is the summary with links:
- [bpf-next,v3,1/1] bpf: Refactor dynptr mutability tracking
https://git.kernel.org/bpf/bpf-next/c/31f61ac33032
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html