summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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
|\ \
| * | KEYS: Don't permit request_key() to construct a new keyringDavid Howells2015-10-191-0/+3
| * | KEYS: Fix crash when attempt to garbage collect an uninstantiated keyringDavid Howells2015-10-151-2/+4
| |/
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Pablo Neira Ayuso2015-10-171-4/+8
|\ \
| * | net: synack packets can be attached to request socketsEric Dumazet2015-10-111-4/+8
* | | netfilter: remove hook owner refcountingFlorian Westphal2015-10-162-7/+0
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-10-021-4/+4
|\ \ | |/
| * KEYS: Fix race between key destruction and finding a keyring by nameDavid Howells2015-09-251-4/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-09-261-1/+1
|\ \ | |/
| * Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2015-09-171-1/+1
| |\
| | * Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau...Ingo Molnar2015-09-121-1/+1
| | |\
| | | * security/device_cgroup: Fix RCU_LOCKDEP_WARN() conditionPaul E. McKenney2015-09-031-1/+1
* | | | netfilter: Pass priv instead of nf_hook_ops to netfilter hooksEric W. Biederman2015-09-182-7/+7
|/ / /
* | | mm: mark most vm_operations_struct constKirill A. Shutemov2015-09-101-1/+1
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-09-0820-362/+1732
|\ \ \
| * \ \ Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2015-08-1512-110/+907
| |\ \ \
OpenPOWER on IntegriCloud