summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm-current/current'Mark Brown2017-10-132-0/+2
|\
| * prctl: add PR_[GS]ET_PDEATHSIG_PROCJürg Billeter2017-10-092-0/+2
* | Merge remote-tracking branch 'tip/auto-latest'Mark Brown2017-10-133-16/+5
|\ \
| * \ Merge branch 'locking/core'Ingo Molnar2017-10-102-15/+4
| |\ \
| | * | locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() wi...Will Deacon2017-10-102-15/+4
| * | | Merge branch 'timers/core'Ingo Molnar2017-10-081-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | timer: Remove expires and data arguments from DEFINE_TIMERKees Cook2017-10-051-1/+1
| | |/
* | | Merge remote-tracking branch 'selinux/next'Mark Brown2017-10-134-31/+44
|\ \ \
| * | | selinux: fix build warningCorentin LABBE2017-10-041-2/+2
| * | | selinux: fix build warning by removing the unused sid variableCorentin LABBE2017-10-041-2/+1
| * | | selinux: Perform both commoncap and selinux xattr checksEric W. Biederman2017-10-041-25/+18
| * | | selinux: Use kmem_cache for hashtab_nodeKyeongdon Kim2017-09-203-2/+23
* | | | integrity: use kernel_read_file_from_path() to read x509 certsChristoph Hellwig2017-10-094-56/+13
* | | | ima: always measure and audit files in policyMimi Zohar2017-10-083-30/+54
* | | | ima: don't remove the securityfs policy fileMimi Zohar2017-10-081-2/+2
| |/ / |/| |
* | | 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
| * | apparmor: Fix shadowed local variable in unpack_trans_table()Geert Uytterhoeven2017-09-221-2/+2
* | | Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2017-09-141-2/+4
|\ \ \