summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.20/bdi' of git://git.kernel.dk/linux-blockLinus Torvalds2015-02-121-7/+6
|\
| * fs: introduce f_op->mmap_capabilities for nommu mmap supportChristoph Hellwig2015-01-201-7/+6
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-02-1111-107/+281
|\ \
| * | SELinux: fix error code in policydb_init()Dan Carpenter2015-02-041-2/+6
| * | selinux: add security in-core xattr support for pstore and debugfsMark Salyzyn2015-02-041-17/+8
| * | selinux: quiet the filesystem labeling behavior messagePaul Moore2015-02-041-4/+0
| * | selinux: Remove unused function avc_sidcmp()Rickard Strandqvist2015-02-041-5/+0
| * | ima: /proc/keys is now mandatoryDavid Howells2015-02-021-1/+0
| * | Merge tag 'keys-next-20150123' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2015-01-292-26/+0
| |\ \
| | * | KEYS: Make /proc/keys unconditional if CONFIG_KEYS=yDavid Howells2015-01-222-26/+0
| * | | Smack: Repair netfilter dependencyCasey Schaufler2015-01-231-1/+1
| |/ /
| * | smack: fix possible use after frees in task_security() callersAndrey Ryabinin2015-01-212-11/+23
| * | smack: Add missing logging in bidirectional UDS connect checkRafal Krypa2015-01-201-1/+1
| * | Smack: secmark support for netfilterCasey Schaufler2015-01-205-8/+196
| * | Smack: Rework file hooksCasey Schaufler2015-01-201-21/+19
| * | smack: Fix a bidirectional UDS connect check typoZbigniew Jasinski2015-01-191-1/+3
| * | smack: introduce a special case for tmpfs in smack_d_instantiate()Ɓukasz Stelmach2015-01-191-2/+14
| * | smack: fix logic in smack_inode_init_security functionLukasz Pawelczyk2015-01-191-3/+2
| * | smack: miscellaneous small fixes in function commentsLukasz Pawelczyk2015-01-191-5/+9
| |/
* | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau...Ingo Molnar2015-01-211-0/+1
|\ \ | |/ |/|
| * rcu: Make SRCU optional by using CONFIG_SRCUPranith Kumar2015-01-061-0/+1
* | KEYS: close race between key lookup and freeingSasha Levin2015-01-051-2/+2
|/
* KEYS: remove a bogus NULL checkDan Carpenter2014-12-161-6/+4
* 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