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 /include/uapi | |
| 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 'include/uapi')
| -rw-r--r-- | include/uapi/linux/keyctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 4c8884eea808..fa85b9760391 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -24,6 +24,7 @@ #define KEY_SPEC_GROUP_KEYRING -6 /* - key ID for GID-specific keyring */ #define KEY_SPEC_REQKEY_AUTH_KEY -7 /* - key ID for assumed request_key auth key */ #define KEY_SPEC_REQUESTOR_KEYRING -8 /* - key ID for request_key() dest keyring */ +#define KEY_SPEC_BPF_KEYRING -9 /* - key ID for the BPF-specific keyring */ /* request-key default keyrings */ #define KEY_REQKEY_DEFL_NO_CHANGE -1 |