diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-20 06:19:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-20 06:19:38 -0400 |
commit | 03b652e5c0cdbdfe31314b644d2b0bc77e736693 (patch) | |
tree | 70553e88c3e37271924ca5d34f3813518e15e1b0 /fs/file_table.c | |
parent | ce43f4fd6f103681c7485c2b1967179647e73555 (diff) | |
parent | 76ba89c76f2c74e208d93a9e7c698e39eeb3b85c (diff) | |
download | linux-03b652e5c0cdbdfe31314b644d2b0bc77e736693.tar.gz linux-03b652e5c0cdbdfe31314b644d2b0bc77e736693.tar.bz2 linux-03b652e5c0cdbdfe31314b644d2b0bc77e736693.zip |
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
Diffstat (limited to 'fs/file_table.c')
0 files changed, 0 insertions, 0 deletions