summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-11-0762-871/+96
|\
| * Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2017-11-0249-0/+49
| |\
| | * License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseGreg Kroah-Hartman2017-11-0249-0/+49
| * | KEYS: trusted: fix writing past end of buffer in trusted_read()Eric Biggers2017-11-021-11/+12
| * | KEYS: return full count in keyring_read() if buffer is too smallEric Biggers2017-11-021-20/+19
| * | Revert "apparmor: add base infastructure for socket mediation"Linus Torvalds2017-10-2612-840/+16
| |/
* | Merge tag 'v4.14-rc6' into locking/core, to pick up fixesIngo Molnar2017-10-2415-54/+90
|\ \ | |/
| * commoncap: move assignment of fs_ns to avoid null pointer dereferenceColin Ian King2017-10-191-1/+2
| * Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5James Morris2017-10-1914-53/+88
| |\
| | * KEYS: load key flags and expiry time atomically in proc_keys_show()Eric Biggers2017-10-181-10/+14
| | * KEYS: Load key expiry time atomically in keyring_search_iterator()Eric Biggers2017-10-181-1/+3
| | * KEYS: load key flags and expiry time atomically in key_validate()Eric Biggers2017-10-181-3/+4
| | * KEYS: don't let add_key() update an uninstantiated keyDavid Howells2017-10-181-0/+10
| | * KEYS: Fix race between updating and finding a negative keyDavid Howells2017-10-1812-39/+49
| | * security/keys: BIG_KEY requires CONFIG_CRYPTOArnd Bergmann2017-10-181-0/+1
| | * KEYS: encrypted: fix dereference of NULL user_key_payloadEric Biggers2017-10-121-0/+7
* | | locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() wi...Will Deacon2017-10-102-15/+4
|/ /
* | lsm: fix smack_inode_removexattr and xattr_getsecurity memleakCasey Schaufler2017-10-041-30/+25
|/
* Merge commit 'keys-fixes-20170927' into fixes-v4.14-rc3James Morris2017-09-289-152/+137
|\
| * security/keys: rewrite all of big_key cryptoJason A. Donenfeld2017-09-252-71/+60
| * security/keys: properly zero out sensitive key material in big_keyJason A. Donenfeld2017-09-251-6/+6
| * KEYS: use kmemdup() in request_key_auth_new()Eric Biggers2017-09-251-3/+2
| * KEYS: restrict /proc/keys by credentials at open timeEric Biggers2017-09-251-6/+2
| * KEYS: reset parent each time before searching key_user_treeEric Biggers2017-09-251-2/+2
| * KEYS: prevent KEYCTL_READ on negative keyEric Biggers2017-09-251-0/+5
| * KEYS: prevent creating a different user's keyringsEric Biggers2017-09-254-12/+21
| * KEYS: fix writing past end of user-supplied buffer in keyring_read()Eric Biggers2017-09-251-9/+5
| * KEYS: fix key refcount leak in keyctl_read_key()Eric Biggers2017-09-251-1/+1
| * KEYS: fix key refcount leak in keyctl_assume_authority()Eric Biggers2017-09-251-4/+2
| * KEYS: don't revoke uninstantiated key in request_key_auth_new()Eric Biggers2017-09-251-1/+0
| * KEYS: fix cred refcount leak in request_key_auth_new()Eric Biggers2017-09-251-37/+31
* | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2017-09-241-3/+3
|\ \
| * | security: fix description of values returned by cap_inode_need_killprivStefan Berger2017-09-231-3/+3
* | | Merge tag 'apparmor-pr-2017-09-22' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-09-2324-137/+2088
|\ \ \ | |_|/ |/| |
| * | apparmor: fix apparmorfs DAC access permissionsJohn Johansen2017-09-221-4/+4
| * | apparmor: fix build failure on sparc caused by undeclared signalsJohn Johansen2017-09-221-1/+4
| * | apparmor: fix incorrect type assignment when freeing proxiesJohn Johansen2017-09-221-1/+1
| * | apparmor: ensure unconfined profiles have dfas initializedJohn Johansen2017-09-221-0/+2
| * | apparmor: fix race condition in null profile creationJohn Johansen2017-09-221-3/+11
| * | apparmor: move new_null_profile to after profile lookup fns()John Johansen2017-09-221-79/+79
| * | apparmor: add base infastructure for socket mediationJohn Johansen2017-09-2212-16/+840
| * | apparmor: add more debug asserts to apparmorfsJohn Johansen2017-09-221-0/+17
| * | apparmor: make policy_unpack able to audit different info messagesJohn Johansen2017-09-222-16/+40
| * | apparmor: add support for absolute root view based labelsJohn Johansen2017-09-222-1/+10
| * | apparmor: cleanup conditional check for label in label_printJohn Johansen2017-09-221-14/+8
| * | apparmor: add mount mediationJohn Johansen2017-09-229-4/+841
| * | apparmor: add the ability to mediate signalsJohn Johansen2017-09-227-0/+231
| * | apparmor: Redundant condition: prev_ns. in [label.c:1498]John Johansen2017-09-221-1/+1
| * | apparmor: Fix an error code in aafs_create()Dan Carpenter2017-09-221-1/+3
| * | apparmor: Fix logical error in verify_header()Christos Gkekas2017-09-221-1/+1