summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell2016-02-151-2/+2
|\
| * Merge 4.5-rc4 into tty-nextGreg Kroah-Hartman2016-02-142-1/+3
| |\
| * \ Merge 4.5-rc2 into tty-nextGreg Kroah-Hartman2016-02-011-1/+2
| |\ \
| * | | tty: Make tty_files_lock per-ttyPeter Hurley2016-01-271-2/+2
* | | | Merge remote-tracking branch 'selinux/next'Stephen Rothwell2016-02-151-1/+1
|\ \ \ \
| * | | | selinux: use absolute path to include directoryAndy Shevchenko2016-01-281-1/+1
* | | | | Merge remote-tracking branch 'integrity/next'Stephen Rothwell2016-02-159-95/+107
|\ \ \ \ \
| * | | | | ima: use "ima_hooks" enum as function argumentMimi Zohar2016-02-105-27/+37
| * | | | | ima: refactor ima_policy_show() to display "ima_hooks" rulesMimi Zohar2016-02-101-27/+36
| * | | | | ima: separate 'security.ima' reading functionality from collectDmitry Kasatkin2016-02-088-40/+33
| * | | | | IMA: fix non-ANSI declaration of ima_check_policy()Colin Ian King2016-02-081-1/+1
| | |_|/ / | |/| | |
* | | | | Merge remote-tracking branch 'crypto/master'Stephen Rothwell2016-02-151-32/+50
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | crypto: keys - Revert "convert public key to akcipher api"Herbert Xu2016-02-092-4/+7
| * | | | integrity: convert digsig to akcipher apiTadeusz Struk2016-02-062-7/+4
| * | | | KEYS: Use skcipherHerbert Xu2016-01-271-32/+50
| | |_|/ | |/| |
* | | | EVM: Use crypto_memneq() for digest comparisonsRyan Ware2016-02-121-1/+2
* | | | selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tablesLorenzo Colitti2016-02-091-0/+1
| |/ / |/| |
* | | KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it setDavid Howells2016-01-281-1/+2
|/ /
* | wrappers for ->i_mutex accessAl Viro2016-01-223-11/+11
* | ptrace: use fsuid, fsgid, effective creds for fs access checksJann Horn2016-01-201-1/+6
* | security: let security modules use PTRACE_MODE_* with bitmasksJann Horn2016-01-202-7/+5
* | KEYS: Fix keyring ref leak in join_session_keyring()Yevgeny Pats2016-01-201-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2016-01-1729-160/+967
|\ \
| * \ Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2016-01-141-8/+2
| |\ \
| | * | selinux: Inode label revalidation performance fixAndreas Gruenbacher2016-01-081-8/+2
| | |/
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2016-01-103-21/+17
| |\ \
| | * | KEYS: refcount bug fixMimi Zohar2016-01-072-12/+8
| | * | ima: ima_write_policy() limit lockingPetko Manolov2016-01-031-9/+9
| * | | Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into...James Morris2015-12-261-1/+23
| |\ \ \
| | * | | Smack: type confusion in smak sendmsg() handlerRoman Kubiak2015-12-171-1/+1
| | * | | Smack: File receive for socketsCasey Schaufler2015-12-091-0/+22
| * | | | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-12-268-73/+274
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()Vladis Dronov2015-12-241-4/+5
| | * | | selinux: export validatetrans decisionsAndrew Perepechko2015-12-244-8/+111
| | * | | selinux: Revalidate invalid inode security labelsAndreas Gruenbacher2015-12-241-8/+68
| | * | | security: Add hook to invalidate inode security labelsAndreas Gruenbacher2015-12-243-10/+34
| | * | | selinux: Add accessor functions for inode->i_securityAndreas Gruenbacher2015-12-241-41/+56
| | * | | security: Make inode argument of inode_getsecid non-constAndreas Gruenbacher2015-12-243-3/+3
| | * | | security: Make inode argument of inode_getsecurity non-constAndreas Gruenbacher2015-12-243-3/+3
| | * | | selinux: Remove unused variable in selinux_inode_init_securityAndreas Gruenbacher2015-12-241-2/+0
| | |/ /
| * | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-12-2619-84/+623
| |\ \ \ | | | |/ | | |/|
| | * | IMA: policy can be updated zero timesSasha Levin2015-12-243-0/+14
| | * | security/integrity: make ima/ima_mok.c explicitly non-modularPaul Gortmaker2015-12-151-3/+2
| | * | ima: update appraise flags after policy update completesMimi Zohar2015-12-151-2/+5
| | * | IMA: prevent keys on the .ima_blacklist from being removedMimi Zohar2015-12-151-0/+2
| | * | KEYS: prevent keys from being removed from specified keyringsMimi Zohar2015-12-152-11/+51
| | * | IMA: allow reading back the current IMA policyPetko Manolov2015-12-154-8/+253
| | * | IMA: create machine owner and blacklist keyringsPetko Manolov2015-12-154-0/+87
| | * | IMA: policy can now be updated multiple timesPetko Manolov2015-12-153-28/+75
| | * | evm: EVM_LOAD_X509 depends on EVMArnd Bergmann2015-12-151-1/+1