diff options
| author | Christian Brauner <brauner@kernel.org> | 2026-10-12 12:33:32 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-10-12 23:37:36 +0200 |
| commit | 592d26f625acef962aa40d1f22f29388bc05de13 (patch) | |
| tree | 546f3eae52bfdce557498530a6d999445cb02699 /kernel/bpf/queue_stack_maps.c | |
| parent | df2908090cda368b01ff43709f51890076c56157 (diff) | |
| parent | 1b7415bf70be95b9a1e7e87d544867881065613f (diff) | |
| download | linux-next-592d26f625acef962aa40d1f22f29388bc05de13.tar.gz linux-next-592d26f625acef962aa40d1f22f29388bc05de13.zip | |
Merge bpf keyring work from of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Bring in the bpf keyring from bpf-next. Andrew's series adds well-known
ids for the dm-verity and fs-verity keyrings. They go right next to
KEY_SPEC_BPF_KEYRING and do what commit 264d8fd2794f ("bpf, keys: Add a
bpf keyring for program signature validation") did. That commit only
exists in bpf-next.
The keyring series was merged into bpf-next in 776c86a3e722 but that
conflicts in kernel/bpf/backtrack.c with the verifier fixes that went
into v7.3-rc2. bpf-next resolved that when it cross-merged v7.3-rc2 in
1b7415bf70be. So pull up to that point and base this on v7.3-rc2 as
well.
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Diffstat (limited to 'kernel/bpf/queue_stack_maps.c')
| -rw-r--r-- | kernel/bpf/queue_stack_maps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/bpf/queue_stack_maps.c b/kernel/bpf/queue_stack_maps.c index 6e8b18c32a10..1cee2ba6e332 100644 --- a/kernel/bpf/queue_stack_maps.c +++ b/kernel/bpf/queue_stack_maps.c @@ -59,6 +59,9 @@ static int queue_stack_map_alloc_check(union bpf_attr *attr) */ return -E2BIG; + if (attr->max_entries >= U32_MAX / attr->value_size) + return -E2BIG; + return 0; } |