summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| * net: add skb_to_full_sk() helper and use it in selinux_netlbl_skbuff_setsid()Eric Dumazet2015-11-082-15/+3
| * selinux: fix random read in selinux_ip_postroute_compat()Eric Dumazet2015-11-051-4/+14
* | mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIMMel Gorman2015-11-061-1/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-11-0525-183/+393
|\ \ | |/ |/|
| * Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2015-10-2313-75/+84
| |\
| | * KEYS: Merge the type-specific data with the payload dataDavid Howells2015-10-2113-67/+82
| | * keys: Be more consistent in selection of union members usedInsu Yun2015-10-211-1/+1
| | * KEYS: use kvfree() in add_keyGeliang Tang2015-10-211-7/+1
| * | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-10-225-45/+36
| |\ \
| | * | selinux: Use a kmem_cache for allocation struct file_security_structSangwoo2015-10-211-2/+6
| | * | selinux: ioctl_has_perm should be staticGeliang Tang2015-10-211-1/+1
| | * | selinux: use sprintf return valueRasmus Villemoes2015-10-211-4/+1
| | * | selinux: use kstrdup() in security_get_bools()Rasmus Villemoes2015-10-211-7/+1
| | * | selinux: use kmemdup in security_sid_to_context_core()Rasmus Villemoes2015-10-211-2/+2
| | * | selinux: remove pointless cast in selinux_inode_setsecurity()Rasmus Villemoes2015-10-211-1/+1
| | * | selinux: introduce security_context_str_to_sidRasmus Villemoes2015-10-214-25/+20
| | * | selinux: do not check open perm on ftruncate callJeff Vander Stoep2015-10-211-1/+2
| | * | selinux: change CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE defaultPaul Moore2015-10-211-2/+2
| | |/
| * / apparmor: clarify CRYPTO dependencyArnd Bergmann2015-10-221-1/+1
| |/
| * Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into...James Morris2015-10-214-47/+238
| |\
| | * Smack: limited capability for changing process labelZbigniew Jasinski2015-10-194-41/+229
| | * Smack: pipefs fix in smack_d_instantiateRoman Kubiak2015-10-091-0/+3
| | * Smack: Minor initialisation improvementJosé Bollo2015-10-092-3/+3
| | * smack: smk_ipv6_port_list should be staticGeliang Tang2015-10-091-1/+1
| | * Smack: fix a NULL dereference in wrong smack_import_entry() usageLukasz Pawelczyk2015-10-091-2/+2
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-10-201-1/+1
| |\ \
| | * | integrity: prevent loading untrusted certificates on the IMA trusted keyringDmitry Kasatkin2015-10-091-1/+1
| | |/
| * | keys, trusted: seal/unseal with TPM 2.0 chipsJarkko Sakkinen2015-10-191-3/+33
| * | keys, trusted: move struct trusted_key_options to trusted-type.hJarkko Sakkinen2015-10-191-11/+0
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-11-012-2/+7
|\ \