mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 13:14:02 +02:00
selftests/bpf: Test bpf_cpumask_populate() rejects a borrowed cpumask
bpf_cpumask_populate() now takes a struct bpf_cpumask *, so update the kfunc declaration and drop the struct cpumask * casts in the existing populate tests. Add test_populate_borrowed_destination, which passes a borrowed task->cpus_ptr and asserts the verifier rejects it as a writable destination. Signed-off-by: Nicholas Dudar <main.kalliope@gmail.com> Acked-by: Tejun Heo <tj@kernel.org> Reviewed-by: Emil Tsalapatis <emil@etsalapatis.com> Link: https://lore.kernel.org/bpf/20260709182800.2037938-3-main.kalliope@gmail.com Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
This commit is contained in:
parent
8740156ad3
commit
6267b83528
|
|
@ -61,7 +61,7 @@ u32 bpf_cpumask_any_distribute(const struct cpumask *src) __ksym __weak;
|
|||
u32 bpf_cpumask_any_and_distribute(const struct cpumask *src1,
|
||||
const struct cpumask *src2) __ksym __weak;
|
||||
u32 bpf_cpumask_weight(const struct cpumask *cpumask) __ksym __weak;
|
||||
int bpf_cpumask_populate(struct cpumask *cpumask, void *src, size_t src__sz) __ksym __weak;
|
||||
int bpf_cpumask_populate(struct bpf_cpumask *cpumask, void *src, size_t src__sz) __ksym __weak;
|
||||
|
||||
void bpf_rcu_read_lock(void) __ksym __weak;
|
||||
void bpf_rcu_read_unlock(void) __ksym __weak;
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ int BPF_PROG(test_populate_invalid_destination, struct task_struct *task, u64 cl
|
|||
u64 bits;
|
||||
int ret;
|
||||
|
||||
ret = bpf_cpumask_populate((struct cpumask *)invalid, &bits, sizeof(bits));
|
||||
ret = bpf_cpumask_populate(invalid, &bits, sizeof(bits));
|
||||
if (!ret)
|
||||
err = 2;
|
||||
|
||||
|
|
@ -252,7 +252,7 @@ int BPF_PROG(test_populate_invalid_source, struct task_struct *task, u64 clone_f
|
|||
return 0;
|
||||
}
|
||||
|
||||
ret = bpf_cpumask_populate((struct cpumask *)local, garbage, 8);
|
||||
ret = bpf_cpumask_populate(local, garbage, 8);
|
||||
if (!ret)
|
||||
err = 2;
|
||||
|
||||
|
|
@ -260,3 +260,22 @@ int BPF_PROG(test_populate_invalid_source, struct task_struct *task, u64 clone_f
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
SEC("tp_btf/task_newtask")
|
||||
__failure __msg("expected pointer to STRUCT bpf_cpumask but R1 has a pointer to STRUCT cpumask")
|
||||
int BPF_PROG(test_populate_borrowed_destination, struct task_struct *task, u64 clone_flags)
|
||||
{
|
||||
u64 bits;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* task->cpus_ptr is a borrowed, read-only struct cpumask *, not an
|
||||
* owned struct bpf_cpumask *. The verifier must reject it as a
|
||||
* writable destination for bpf_cpumask_populate().
|
||||
*/
|
||||
ret = bpf_cpumask_populate((struct bpf_cpumask *)task->cpus_ptr, &bits, sizeof(bits));
|
||||
if (!ret)
|
||||
err = 2;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -785,7 +785,7 @@ int BPF_PROG(test_populate_reject_small_mask, struct task_struct *task, u64 clon
|
|||
return 0;
|
||||
|
||||
/* The kfunc should prevent this operation */
|
||||
ret = bpf_cpumask_populate((struct cpumask *)local, &toofewbits, sizeof(toofewbits));
|
||||
ret = bpf_cpumask_populate(local, &toofewbits, sizeof(toofewbits));
|
||||
if (ret != -EACCES)
|
||||
err = 2;
|
||||
|
||||
|
|
@ -824,7 +824,7 @@ int BPF_PROG(test_populate_reject_unaligned, struct task_struct *task, u64 clone
|
|||
/* Misalign the source array by a byte. */
|
||||
src = &((char *)bits)[1];
|
||||
|
||||
ret = bpf_cpumask_populate((struct cpumask *)mask, src, CPUMASK_TEST_MASKLEN);
|
||||
ret = bpf_cpumask_populate(mask, src, CPUMASK_TEST_MASKLEN);
|
||||
if (ret != -EINVAL)
|
||||
err = 2;
|
||||
|
||||
|
|
@ -855,7 +855,7 @@ int BPF_PROG(test_populate, struct task_struct *task, u64 clone_flags)
|
|||
}
|
||||
|
||||
/* Pass the entire bits array, the kfunc will only copy the valid bits. */
|
||||
ret = bpf_cpumask_populate((struct cpumask *)mask, bits, CPUMASK_TEST_MASKLEN);
|
||||
ret = bpf_cpumask_populate(mask, bits, CPUMASK_TEST_MASKLEN);
|
||||
if (ret) {
|
||||
err = 2;
|
||||
goto out;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user