diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-09-28 02:11:28 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-09-28 02:11:28 +0300 |
| commit | 2569e7e1d684e418ba7ffc9d0ad9a5f5247df0a0 (patch) | |
| tree | 61ed98d4a5c453dca511c548213d364ce75711d0 /include/linux | |
| parent | 9cd6681cb1169e815c41af0265165dd1b872f228 (diff) | |
| parent | 428490e38b2e352812e0b765d8bceafab0ec441d (diff) | |
| download | linux-2569e7e1d684e418ba7ffc9d0ad9a5f5247df0a0.tar.xz | |
Merge commit 'keys-fixes-20170927' into fixes-v4.14-rc3
From David Howells:
"There are two sets of patches here:
(1) A bunch of core keyrings bug fixes from Eric Biggers.
(2) Fixing big_key to use safe crypto from Jason A. Donenfeld."
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 044114185120..e315e16b6ff8 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -187,6 +187,7 @@ struct key { #define KEY_FLAG_BUILTIN 8 /* set if key is built in to the kernel */ #define KEY_FLAG_ROOT_CAN_INVAL 9 /* set if key can be invalidated by root without permission */ #define KEY_FLAG_KEEP 10 /* set if key should not be removed */ +#define KEY_FLAG_UID_KEYRING 11 /* set if key is a user or user session keyring */ /* the key type and key description string * - the desc is used to match a key against search criteria @@ -243,6 +244,7 @@ extern struct key *key_alloc(struct key_type *type, #define KEY_ALLOC_NOT_IN_QUOTA 0x0002 /* not in quota */ #define KEY_ALLOC_BUILT_IN 0x0004 /* Key is built into kernel */ #define KEY_ALLOC_BYPASS_RESTRICTION 0x0008 /* Override the check on restricted keyrings */ +#define KEY_ALLOC_UID_KEYRING 0x0010 /* allocating a user or user session keyring */ extern void key_revoke(struct key *key); extern void key_invalidate(struct key *key); |