This reverts merge 0f75ef6a9cff49ff612f7ce0578bced9d0b38325 (and thus effectively commits 7a1ade847596 ("keys: Provide KEYCTL_GRANT_PERMISSION") 2e12256b9a76 ("keys: Replace uid/gid/perm permissions checking with an ACL") that the merge brought in). It turns out that it breaks booting with an encrypted volume, and Eric biggers reports that it also breaks the fscrypt tests [1] and loading of in-kernel X.509 certificates [2]. The root cause of all the breakage is likely the same, but David Howells is off email so rather than try to work it out it's getting reverted in order to not impact the rest of the merge window. [1] https://lore.kernel.org/lkml/20190710011559.GA7973@sol.localdomain/ [2] https://lore.kernel.org/lkml/20190710013225.GB7973@sol.localdomain/
Showing the changes to include/uapi/linux (1 of 46 files). Show all
Unified · Split
| @@ -15,69 +15,6 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/types.h> |
| 17 | 17 | |
| 18 | −/* | |
| 19 | − * Keyring permission grant definitions | |
| 20 | − */ | |
| 21 | −enum key_ace_subject_type { | |
| 22 | − KEY_ACE_SUBJ_STANDARD = 0, /* subject is one of key_ace_standard_subject */ | |
| 23 | − nr__key_ace_subject_type | |
| 24 | −}; | |
| 25 | − | |
| 26 | −enum key_ace_standard_subject { | |
| 27 | − KEY_ACE_EVERYONE = 0, /* Everyone, including owner and group */ | |
| 28 | − KEY_ACE_GROUP = 1, /* The key's group */ | |
| 29 | − KEY_ACE_OWNER = 2, /* The owner of the key */ | |
| 30 | − KEY_ACE_POSSESSOR = 3, /* Any process that possesses of the key */ | |
| 31 | − nr__key_ace_standard_subject | |
| 32 | −}; | |
| 33 | − | |
| 34 | −#define KEY_ACE_VIEW 0x00000001 /* Can describe the key */ | |
| 35 | −#define KEY_ACE_READ 0x00000002 /* Can read the key content */ | |
| 36 | −#define KEY_ACE_WRITE 0x00000004 /* Can update/modify the key content */ | |
| 37 | −#define KEY_ACE_SEARCH 0x00000008 /* Can find the key by search */ | |
| 38 | −#define KEY_ACE_LINK 0x00000010 /* Can make a link to the key */ | |
| 39 | −#define KEY_ACE_SET_SECURITY 0x00000020 /* Can set owner, group, ACL */ | |
| 40 | −#define KEY_ACE_INVAL 0x00000040 /* Can invalidate the key */ | |
| 41 | −#define KEY_ACE_REVOKE 0x00000080 /* Can revoke the key */ | |
| 42 | −#define KEY_ACE_JOIN 0x00000100 /* Can join keyring */ | |
| 43 | −#define KEY_ACE_CLEAR 0x00000200 /* Can clear keyring */ | |
| 44 | −#define KEY_ACE__PERMS 0xffffffff | |
| 45 | − | |
| 46 | −/* | |
| 47 | − * Old-style permissions mask, deprecated in favour of ACL. | |
| 48 | − */ | |
| 49 | −#define KEY_POS_VIEW 0x01000000 /* possessor can view a key's attributes */ | |
| 50 | −#define KEY_POS_READ 0x02000000 /* possessor can read key payload / view keyring */ | |
| 51 | −#define KEY_POS_WRITE 0x04000000 /* possessor can update key payload / add link to keyring */ | |
| 52 | −#define KEY_POS_SEARCH 0x08000000 /* possessor can find a key in search / search a keyring */ | |
| 53 | −#define KEY_POS_LINK 0x10000000 /* possessor can create a link to a key/keyring */ | |
| 54 | −#define KEY_POS_SETATTR 0x20000000 /* possessor can set key attributes */ | |
| 55 | −#define KEY_POS_ALL 0x3f000000 | |
| 56 | − | |
| 57 | −#define KEY_USR_VIEW 0x00010000 /* user permissions... */ | |
| 58 | −#define KEY_USR_READ 0x00020000 | |
| 59 | −#define KEY_USR_WRITE 0x00040000 | |
| 60 | −#define KEY_USR_SEARCH 0x00080000 | |
| 61 | −#define KEY_USR_LINK 0x00100000 | |
| 62 | −#define KEY_USR_SETATTR 0x00200000 | |
| 63 | −#define KEY_USR_ALL 0x003f0000 | |
| 64 | − | |
| 65 | −#define KEY_GRP_VIEW 0x00000100 /* group permissions... */ | |
| 66 | −#define KEY_GRP_READ 0x00000200 | |
| 67 | −#define KEY_GRP_WRITE 0x00000400 | |
| 68 | −#define KEY_GRP_SEARCH 0x00000800 | |
| 69 | −#define KEY_GRP_LINK 0x00001000 | |
| 70 | −#define KEY_GRP_SETATTR 0x00002000 | |
| 71 | −#define KEY_GRP_ALL 0x00003f00 | |
| 72 | − | |
| 73 | −#define KEY_OTH_VIEW 0x00000001 /* third party permissions... */ | |
| 74 | −#define KEY_OTH_READ 0x00000002 | |
| 75 | −#define KEY_OTH_WRITE 0x00000004 | |
| 76 | −#define KEY_OTH_SEARCH 0x00000008 | |
| 77 | −#define KEY_OTH_LINK 0x00000010 | |
| 78 | −#define KEY_OTH_SETATTR 0x00000020 | |
| 79 | −#define KEY_OTH_ALL 0x0000003f | |
| 80 | − | |
| 81 | 18 | /* special process keyring shortcut IDs */ |
| 82 | 19 | #define KEY_SPEC_THREAD_KEYRING -1 /* - key ID for thread-specific keyring */ |
| 83 | 20 | #define KEY_SPEC_PROCESS_KEYRING -2 /* - key ID for process-specific keyring */ |
| @@ -132,7 +69,6 @@ enum key_ace_standard_subject { · 48 unmodified lines | ||
| 132 | 69 | #define KEYCTL_RESTRICT_KEYRING 29 /* Restrict keys allowed to link to a keyring */ |
| 133 | 70 | #define KEYCTL_MOVE 30 /* Move keys between keyrings */ |
| 134 | 71 | #define KEYCTL_CAPABILITIES 31 /* Find capabilities of keyrings subsystem */ |
| 135 | −#define KEYCTL_GRANT_PERMISSION 32 /* Grant a permit to a key */ | |
| 136 | 72 | |
| 137 | 73 | /* keyctl structures */ |
| 138 | 74 | struct keyctl_dh_params { |
| @@ -194,6 +130,5 @@ struct keyctl_pkey_params { · 55 unmodified lines | ||
| 194 | 130 | #define KEYCTL_CAPS0_MOVE 0x80 /* KEYCTL_MOVE supported */ |
| 195 | 131 | #define KEYCTL_CAPS1_NS_KEYRING_NAME 0x01 /* Keyring names are per-user_namespace */ |
| 196 | 132 | #define KEYCTL_CAPS1_NS_KEY_TAG 0x02 /* Key indexing can include a namespace tag */ |
| 197 | −#define KEYCTL_CAPS1_ACL_ALTERABLE 0x04 /* Keys have internal ACL that can be altered */ | |
| 198 | 133 | |
| 199 | 134 | #endif /* _LINUX_KEYCTL_H */ |