summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-021-1/+1
|\
| * Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-03-271-1/+1
| |\
| | * selinux: fix sel_write_enforce broken return valueJoe Perches2015-03-251-1/+1
* | | Revert "selinux: add a skb_owned_by() hook"Eric Dumazet2015-03-203-18/+0
|/ /
* | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-02-227-23/+21
|\ \
| * | VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)David Howells2015-02-222-3/+3
| * | SELinux: Use d_is_positive() rather than testing dentry->d_inodeDavid Howells2015-02-221-2/+2
| * | Smack: Use d_is_positive() rather than testing dentry->d_inodeDavid Howells2015-02-221-2/+2
| * | TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR()David Howells2015-02-221-3/+1
| * | Apparmor: Use d_is_positive/negative() rather than testing dentry->d_inodeDavid Howells2015-02-221-1/+1
| * | Apparmor: mediated_filesystem() should use dentry->d_sb not inode->i_sbDavid Howells2015-02-222-12/+12
* | | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2015-02-192-3/+3
|\ \ \ | |/ / |/| |
| * | kconfig: use bool instead of boolean for type definition attributesChristoph Jaeger2015-01-072-3/+3
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2015-02-172-54/+4
|\ \ \
| * | | file->f_path.dentry is pinned down for as long as the file is open...Al Viro2015-01-251-5/+1
| * | | selinuxfs: don't open-code d_genocide()Al Viro2015-01-251-49/+3
* | | | Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/k...James Morris2015-02-161-0/+16
|\ \ \ \
| * | | | Smack: secmark connectionsCasey Schaufler2015-02-111-0/+16
* | | | | Don't leak a key reference if request_key() tries to use a revoked keyringDavid Jeffery2015-02-161-0/+1
* | | | | Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2015-02-154-0/+125
|\ \ \ \ \
| * | | | | Add security hooks to binder and implement the hooks for SELinux.Stephen Smalley2015-01-254-0/+125
| | |/ / / | |/| | |
* | | | | 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
OpenPOWER on IntegriCloud