mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 23:09:29 +02:00
Add verifier coverage for the two ways a non-percpu pointer can be stored in a __percpu_kptr field: a program-BTF local allocation returned by bpf_obj_new(), and a referenced kernel-BTF task_struct pointer. Without the verifier fix, both programs are unexpectedly accepted and the negative tests fail. Requiring MEM_PERCPU makes both programs fail verification with the expected invalid-kptr diagnostic. Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> Link: https://lore.kernel.org/r/20260904084325.52250-3-memxor@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
242 lines
4.4 KiB
C
242 lines
4.4 KiB
C
#include "bpf_experimental.h"
|
|
#include "bpf_misc.h"
|
|
|
|
struct val_t {
|
|
long b, c, d;
|
|
};
|
|
|
|
struct val2_t {
|
|
long b;
|
|
};
|
|
|
|
struct val_with_ptr_t {
|
|
char *p;
|
|
};
|
|
|
|
struct val_with_rb_root_t {
|
|
struct bpf_spin_lock lock;
|
|
};
|
|
|
|
struct val_600b_t {
|
|
char b[600];
|
|
};
|
|
|
|
struct elem {
|
|
long sum;
|
|
struct val_t __percpu_kptr *pc;
|
|
};
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARRAY);
|
|
__uint(max_entries, 1);
|
|
__type(key, int);
|
|
__type(value, struct elem);
|
|
} array SEC(".maps");
|
|
|
|
struct kernel_percpu_elem {
|
|
struct task_struct __percpu_kptr *task;
|
|
};
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_ARRAY);
|
|
__uint(max_entries, 1);
|
|
__type(key, int);
|
|
__type(value, struct kernel_percpu_elem);
|
|
} kernel_percpu_array SEC(".maps");
|
|
|
|
struct task_struct *bpf_task_from_pid(s32 pid) __ksym;
|
|
void bpf_task_release(struct task_struct *p) __ksym;
|
|
|
|
long ret;
|
|
|
|
SEC("?fentry/bpf_fentry_test1")
|
|
__failure __msg("store to referenced kptr disallowed")
|
|
int BPF_PROG(test_array_map_1)
|
|
{
|
|
struct val_t __percpu_kptr *p;
|
|
struct elem *e;
|
|
int index = 0;
|
|
|
|
e = bpf_map_lookup_elem(&array, &index);
|
|
if (!e)
|
|
return 0;
|
|
|
|
p = bpf_percpu_obj_new(struct val_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
p = bpf_kptr_xchg(&e->pc, p);
|
|
if (p)
|
|
bpf_percpu_obj_drop(p);
|
|
|
|
e->pc = (struct val_t __percpu_kptr *)ret;
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry/bpf_fentry_test1")
|
|
__failure __msg("invalid kptr access, R2 type=percpu_ptr_val2_t expected=ptr_val_t")
|
|
int BPF_PROG(test_array_map_2)
|
|
{
|
|
struct val2_t __percpu_kptr *p2;
|
|
struct val_t __percpu_kptr *p;
|
|
struct elem *e;
|
|
int index = 0;
|
|
|
|
e = bpf_map_lookup_elem(&array, &index);
|
|
if (!e)
|
|
return 0;
|
|
|
|
p2 = bpf_percpu_obj_new(struct val2_t);
|
|
if (!p2)
|
|
return 0;
|
|
|
|
p = bpf_kptr_xchg(&e->pc, p2);
|
|
if (p)
|
|
bpf_percpu_obj_drop(p);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("R1 type=scalar expected=percpu_ptr_, percpu_rcu_ptr_, percpu_trusted_ptr_")
|
|
int BPF_PROG(test_array_map_3)
|
|
{
|
|
struct val_t __percpu_kptr *p, *p1;
|
|
struct val_t *v;
|
|
struct elem *e;
|
|
int index = 0;
|
|
|
|
e = bpf_map_lookup_elem(&array, &index);
|
|
if (!e)
|
|
return 0;
|
|
|
|
p = bpf_percpu_obj_new(struct val_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
p1 = bpf_kptr_xchg(&e->pc, p);
|
|
if (p1)
|
|
bpf_percpu_obj_drop(p1);
|
|
|
|
v = bpf_this_cpu_ptr(p);
|
|
ret = v->b;
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("R1 expected for bpf_percpu_obj_drop()")
|
|
int BPF_PROG(test_array_map_4)
|
|
{
|
|
struct val_t __percpu_kptr *p;
|
|
|
|
p = bpf_percpu_obj_new(struct val_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
bpf_obj_drop(p);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("R1 expected for bpf_obj_drop()")
|
|
int BPF_PROG(test_array_map_5)
|
|
{
|
|
struct val_t *p;
|
|
|
|
p = bpf_obj_new(struct val_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
bpf_percpu_obj_drop(p);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?syscall")
|
|
__failure __msg("invalid kptr access, R2 type=trusted_ptr_ expected=ptr_task_struct")
|
|
int reject_kernel_ptr_into_percpu_kptr(void *ctx)
|
|
{
|
|
struct kernel_percpu_elem *e;
|
|
struct task_struct *p, *old;
|
|
int index = 0;
|
|
|
|
e = bpf_map_lookup_elem(&kernel_percpu_array, &index);
|
|
if (!e)
|
|
return 0;
|
|
|
|
p = bpf_task_from_pid(1);
|
|
if (!p)
|
|
return 0;
|
|
|
|
old = bpf_kptr_xchg(&e->task, p);
|
|
if (old)
|
|
bpf_task_release(old);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("invalid kptr access, R2 type=ptr_ expected=ptr_val_t")
|
|
int BPF_PROG(reject_plain_alloc_into_percpu_kptr)
|
|
{
|
|
struct val_t __percpu_kptr *old;
|
|
struct val_t *p;
|
|
struct elem *e;
|
|
int index = 0;
|
|
|
|
e = bpf_map_lookup_elem(&array, &index);
|
|
if (!e)
|
|
return 0;
|
|
|
|
p = bpf_obj_new(struct val_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
old = bpf_kptr_xchg(&e->pc, p);
|
|
if (old)
|
|
bpf_percpu_obj_drop(old);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("bpf_percpu_obj_new type ID argument must be of a struct of scalars")
|
|
int BPF_PROG(test_array_map_6)
|
|
{
|
|
struct val_with_ptr_t __percpu_kptr *p;
|
|
|
|
p = bpf_percpu_obj_new(struct val_with_ptr_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
bpf_percpu_obj_drop(p);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("bpf_percpu_obj_new type ID argument must not contain special fields")
|
|
int BPF_PROG(test_array_map_7)
|
|
{
|
|
struct val_with_rb_root_t __percpu_kptr *p;
|
|
|
|
p = bpf_percpu_obj_new(struct val_with_rb_root_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
bpf_percpu_obj_drop(p);
|
|
return 0;
|
|
}
|
|
|
|
SEC("?fentry.s/bpf_fentry_test1")
|
|
__failure __msg("bpf_percpu_obj_new type size (600) is greater than 512")
|
|
int BPF_PROG(test_array_map_8)
|
|
{
|
|
struct val_600b_t __percpu_kptr *p;
|
|
|
|
p = bpf_percpu_obj_new(struct val_600b_t);
|
|
if (!p)
|
|
return 0;
|
|
|
|
bpf_percpu_obj_drop(p);
|
|
return 0;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|