summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | evm: reset EVM status when file attributes changeDmitry Kasatkin2015-12-151-0/+13
| | * | evm: provide a function to set the EVM key from the kernelDmitry Kasatkin2015-12-152-14/+46
| | * | evm: enable EVM when X509 certificate is loadedDmitry Kasatkin2015-12-154-3/+14
| | * | evm: load an x509 certificate from the kernelDmitry Kasatkin2015-12-154-0/+33
| | * | integrity: define '.evm' as a builtin 'trusted' keyringDmitry Kasatkin2015-11-237-22/+35
| | |/
| * | keys, trusted: seal with a TPM2 authorization policyJarkko Sakkinen2015-12-201-0/+26
| * | keys, trusted: select hash algorithm for TPM2 chipsJarkko Sakkinen2015-12-202-1/+27
| * | keys, trusted: fix: *do not* allow duplicate key optionsJarkko Sakkinen2015-12-201-0/+3
| |/
* | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-01-124-168/+82
|\ \
| * \ Merge branch 'for-linus' into work.miscAl Viro2016-01-081-9/+9
| |\ \
| * | | fix the leak in integrity_read_file()Al Viro2016-01-041-5/+6
| * | | selinuxfs: switch to memdup_user_nul()Al Viro2016-01-041-73/+41
| * | | convert a bunch of open-coded instances of memdup_user_nul()Al Viro2016-01-042-90/+35
* | | | Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2016-01-111-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | nfs: Move call to security_inode_listsecurity into nfs_listxattrAndreas Gruenbacher2015-12-131-2/+0
| |/ /
* | | KEYS: Fix race between read and revokeDavid Howells2015-12-191-9/+9
|/ /
* | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-11-261-2/+2
|\ \
| * | selinux: fix bug in conditional rules handlingStephen Smalley2015-11-241-2/+2
* | | KEYS: Fix handling of stored error in a negatively instantiated user keyDavid Howells2015-11-253-2/+10
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-11-103-9/+10
|\ \
| * | smack: use skb_to_full_sk() helperEric Dumazet2015-11-081-4/+7
OpenPOWER on IntegriCloud