summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-12-162-2/+5
|\
| * ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not metMichael Ellerman2014-12-061-1/+1
| * KEYS: Fix stale key registration at error pathTakashi Iwai2014-12-061-1/+4
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-12-1415-133/+326
|\|
| * Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-12-051-6/+5
| |\
| | * selinux: Remove security_ops externYao Dongdong2014-12-011-2/+0
| * | Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel in...James Morris2014-11-272-12/+18
| |\ \
| | * | security: smack: fix out-of-bounds access in smk_parse_smack()Andrey Ryabinin2014-11-211-4/+3
| | * | Security: smack: replace kzalloc with kmem_cache for inode_smackRohit2014-10-311-3/+10
| | * | Smack: Lock mode for the floor and hat labelsCasey Schaufler2014-10-281-5/+5
| * | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-11-1912-119/+308
| |\ \ \
| | * | | VFS: refactor vfs_read()Dmitry Kasatkin2014-11-171-7/+3
| | * | | ima: require signature based appraisalDmitry Kasatkin2014-11-172-0/+13
| | * | | integrity: provide a hook to load keys when rootfs is readyDmitry Kasatkin2014-11-171-0/+11
| | * | | ima: load x509 certificate from the kernelDmitry Kasatkin2014-11-174-2/+44
| | * | | integrity: provide a function to load x509 certificate from the kernelDmitry Kasatkin2014-11-172-1/+37
| | * | | integrity: define a new function integrity_read_file()Dmitry Kasatkin2014-11-173-32/+85
| | * | | ima: added support for new kernel cmdline parameter ima_template_fmtRoberto Sassu2014-10-131-5/+34
| | * | | ima: allocate field pointers array on demand in template_desc_init_fields()Roberto Sassu2014-10-131-21/+13
| | * | | ima: don't allocate a copy of template_fmt in template_desc_init_fields()Roberto Sassu2014-10-131-13/+17
| | * | | ima: display template format in meas. list if template name length is zeroRoberto Sassu2014-10-132-5/+15
| | * | | ima: added error messages to template-related functionsRoberto Sassu2014-10-131-5/+17
| | * | | ima: use atomic bit operations to protect policy update interfaceDmitry Kasatkin2014-10-112-28/+18
| | * | | ima: ignore empty and with whitespaces policy linesDmitry Kasatkin2014-10-111-1/+2
| | * | | ima: no need to allocate entry for commentDmitry Kasatkin2014-10-111-8/+6
| | * | | ima: report policy load statusDmitry Kasatkin2014-10-111-0/+2
| | * | | ima: use path names cacheDmitry Kasatkin2014-10-072-3/+4
| | * | | evm: skip replacing EVM signature with HMAC on read-only filesystemDmitry Kasatkin2014-10-071-3/+8
| | * | | integrity: add missing '__init' keyword for integrity_init_keyring()Dmitry Kasatkin2014-10-072-2/+2
| | * | | ima: check ima_policy_flag in the ima_file_free() hookDmitry Kasatkin2014-10-073-7/+1
| | |/ /
| * | | Merge commit 'v3.17' into nextJames Morris2014-11-1910-50/+17
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-12-106-13/+13
|\ \ \ \
| * \ \ \ Merge branch 'iov_iter' into for-nextAl Viro2014-12-084-6/+13
| |\ \ \ \
| * | | | | kill f_dentry usesAl Viro2014-11-194-6/+6
| * | | | | assorted conversions to %p[dD]Al Viro2014-11-191-4/+4
| * | | | | move d_rcu from overlapping d_child to overlapping d_aliasAl Viro2014-11-031-3/+3
* | | | | | KEYS: request_key() should reget expired keys rather than give EKEYEXPIREDDavid Howells2014-12-013-2/+5
* | | | | | KEYS: Simplify KEYRING_SEARCH_{NO,DO}_STATE_CHECK flagsDavid Howells2014-12-013-3/+6
* | | | | | KEYS: Fix the size of the key description passed to/from userspaceDavid Howells2014-12-011-30/+26
| |/ / / / |/| | | |
* | | | | Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-11-131-3/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm()Richard Guy Briggs2014-11-121-3/+4
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zoh...James Morris2014-10-293-3/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | evm: check xattr value length and type in evm_inode_setxattr()Dmitry Kasatkin2014-10-281-3/+6
| * | | | ima: check xattr value length and type in the ima_inode_setxattr()Dmitry Kasatkin2014-10-282-0/+3
| | |/ / | |/| |
* | | | Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-10-161-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | selinux: fix inode security list corruptionStephen Smalley2014-10-151-1/+1
* | | | security, crypto: LLVMLinux: Remove VLAIS from ima_crypto.cBehan Webster2014-10-141-28/+19
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-10-1237-593/+912
|\ \ \ \ | | |/ / | |/| |
| * | | integrity: do zero padding of the key idDmitry Kasatkin2014-10-061-1/+1
| * | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-10-026-47/+94
| |\ \ \