Merge branch 'fixes-v4.14-rc5' of...
Merge branch 'fixes-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull key handling fixes from James Morris: "This includes a fix for the capabilities code from Colin King, and a set of further fixes for the keys subsystem. From David: - Fix a bunch of places where kernel drivers may access revoked user-type keys and don't do it correctly. - Fix some ecryptfs bits. - Fix big_key to require CONFIG_CRYPTO. - Fix a couple of bugs in the asymmetric key type. - Fix a race between updating and finding negative keys. - Prevent add_key() from updating uninstantiated keys. - Make loading of key flags and expiry time atomic when not holding locks" * 'fixes-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: commoncap: move assignment of fs_ns to avoid null pointer dereference pkcs7: Prevent NULL pointer dereference, since sinfo is not always set. KEYS: load key flags and expiry time atomically in proc_keys_show() KEYS: Load key expiry time atomically in keyring_search_iterator() KEYS: load key flags and expiry time atomically in key_validate() KEYS: don't let add_key() update an uninstantiated key KEYS: Fix race between updating and finding a negative key KEYS: checking the input id parameters before finding asymmetric key KEYS: Fix the wrong index when checking the existence of second id security/keys: BIG_KEY requires CONFIG_CRYPTO ecryptfs: fix dereference of NULL user_key_payload fscrypt: fix dereference of NULL user_key_payload lib/digsig: fix dereference of NULL user_key_payload FS-Cache: fix dereference of NULL user_key_payload KEYS: encrypted: fix dereference of NULL user_key_payload
No related branches found
No related tags found
Showing
- crypto/asymmetric_keys/asymmetric_type.c 3 additions, 1 deletioncrypto/asymmetric_keys/asymmetric_type.c
- crypto/asymmetric_keys/pkcs7_parser.c 3 additions, 0 deletionscrypto/asymmetric_keys/pkcs7_parser.c
- fs/crypto/keyinfo.c 5 additions, 0 deletionsfs/crypto/keyinfo.c
- fs/ecryptfs/ecryptfs_kernel.h 17 additions, 7 deletionsfs/ecryptfs/ecryptfs_kernel.h
- fs/ecryptfs/keystore.c 8 additions, 1 deletionfs/ecryptfs/keystore.c
- fs/fscache/object-list.c 7 additions, 0 deletionsfs/fscache/object-list.c
- include/linux/key.h 30 additions, 17 deletionsinclude/linux/key.h
- lib/digsig.c 6 additions, 0 deletionslib/digsig.c
- net/dns_resolver/dns_key.c 1 addition, 1 deletionnet/dns_resolver/dns_key.c
- security/commoncap.c 2 additions, 1 deletionsecurity/commoncap.c
- security/keys/Kconfig 1 addition, 0 deletionssecurity/keys/Kconfig
- security/keys/big_key.c 2 additions, 2 deletionssecurity/keys/big_key.c
- security/keys/encrypted-keys/encrypted.c 8 additions, 1 deletionsecurity/keys/encrypted-keys/encrypted.c
- security/keys/gc.c 4 additions, 4 deletionssecurity/keys/gc.c
- security/keys/key.c 30 additions, 11 deletionssecurity/keys/key.c
- security/keys/keyctl.c 4 additions, 5 deletionssecurity/keys/keyctl.c
- security/keys/keyring.c 8 additions, 6 deletionssecurity/keys/keyring.c
- security/keys/permission.c 4 additions, 3 deletionssecurity/keys/permission.c
- security/keys/proc.c 19 additions, 12 deletionssecurity/keys/proc.c
- security/keys/process_keys.c 1 addition, 1 deletionsecurity/keys/process_keys.c
Loading
Please register or sign in to comment