summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2016-01-1853-374/+1281
|\
| * 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-101-0/+22
| * | | | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-12-2615-88/+302
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | * | | gfs2: Invalid security labels of inodes when they go invalidAndreas Gruenbacher2015-12-241-0/+2
| | * | | selinux: Revalidate invalid inode security labelsAndreas Gruenbacher2015-12-241-8/+68
| | * | | security: Add hook to invalidate inode security labelsAndreas Gruenbacher2015-12-245-10/+45
| | * | | selinux: Add accessor functions for inode->i_securityAndreas Gruenbacher2015-12-241-41/+56
| | * | | security: Make inode argument of inode_getsecid non-constAndreas Gruenbacher2015-12-249-15/+15
| | * | | security: Make inode argument of inode_getsecurity non-constAndreas Gruenbacher2015-12-245-6/+6
| | * | | 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-2623-84/+657
| |\ \ \ | | | |/ | | |/|
| | * | IMA: policy can be updated zero timesSasha Levin2015-12-253-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-153-11/+52
| | * | IMA: allow reading back the current IMA policyPetko Manolov2015-12-154-8/+253
| | * | IMA: create machine owner and blacklist keyringsPetko Manolov2015-12-156-0/+113
| | * | 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-153-14/+53
| | * | 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-204-18/+70
| * | keys, trusted: select hash algorithm for TPM2 chipsJarkko Sakkinen2015-12-209-7/+77
| * | keys, trusted: fix: *do not* allow duplicate key optionsJarkko Sakkinen2015-12-201-0/+3
| * | tpm_ibmvtpm: properly handle interrupted packet receptionsStefan Berger2015-12-202-2/+21
| * | tpm_tis: Tighten IRQ auto-probingJason Gunthorpe2015-12-201-7/+12
| * | tpm_tis: Refactor the interrupt setupJason Gunthorpe2015-12-201-100/+84
| * | tpm_tis: Get rid of the duplicate IRQ probing codeJason Gunthorpe2015-12-202-45/+20
| * | tpm: rework tpm_get_timeouts()Jason Gunthorpe2015-12-203-28/+34
| * | tpm_tis: Ensure interrupts are disabled when the driver startsJason Gunthorpe2015-12-201-11/+9
| * | tpm_tis: Use devm_free_irq not free_irqJason Gunthorpe2015-12-201-1/+1
| * | tpm_tis: further simplify calculation of ordinal durationMartin Wilck2015-12-021-3/+5
| |/
| * Sync to Linus v4.4-rc2 for LSM developers.James Morris2015-11-239734-239352/+476611
| |\
| * | security/capability.h: cap_issubset/isclear can be booleanYaowei Bai2015-11-181-8/+8
| * | security: remove unused cap_is_fs_cap functionYaowei Bai2015-11-181-6/+0
* | | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2016-01-183-118/+114
|\ \ \
| * | | audit: always enable syscall auditing when supported and audit is enabledPaul Moore2016-01-131-8/+3