Merge branch 'fixes-v5.1-rc6' of...
Merge branch 'fixes-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull keys fixes from James Morris: - Handle quotas better, allowing full quota to be reached. - Fix the creation of shortcuts in the assoc_array internal representation when the index key needs to be an exact multiple of the machine word size. - Fix a dependency loop between the request_key contruction record and the request_key authentication key. The construction record isn't really necessary and can be dispensed with. - Set the timestamp on a new key rather than leaving it as 0. This would ordinarily be fine - provided the system clock is never set to a time before 1970 * 'fixes-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: keys: Timestamp new keys keys: Fix dependency loop between construction record and auth key assoc_array: Fix shortcut creation KEYS: allow reaching the keys quotas exactly
Showing
- fs/nfs/nfs4idmap.c 17 additions, 14 deletionsfs/nfs/nfs4idmap.c
- include/keys/request_key_auth-type.h 36 additions, 0 deletionsinclude/keys/request_key_auth-type.h
- include/linux/key-type.h 6 additions, 16 deletionsinclude/linux/key-type.h
- lib/assoc_array.c 5 additions, 3 deletionslib/assoc_array.c
- security/keys/internal.h 1 addition, 12 deletionssecurity/keys/internal.h
- security/keys/key.c 3 additions, 2 deletionssecurity/keys/key.c
- security/keys/keyctl.c 1 addition, 0 deletionssecurity/keys/keyctl.c
- security/keys/process_keys.c 1 addition, 0 deletionssecurity/keys/process_keys.c
- security/keys/request_key.c 29 additions, 43 deletionssecurity/keys/request_key.c
- security/keys/request_key_auth.c 9 additions, 7 deletionssecurity/keys/request_key_auth.c
Please register or sign in to comment