summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2018-06-071-7/+5
|\
| * Merge branch 'smack-for-4.18' of https://github.com/cschaufler/next-smack int...James Morris2018-06-051-7/+5
| |\
| | * Smack: Fix memory leak in smack_inode_getsecctxCasey Schaufler2018-06-051-7/+5
* | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-06-0713-83/+362
|\ \ \
| * | | EVM: unlock on error path in evm_read_xattrs()Dan Carpenter2018-06-011-1/+3
| * | | EVM: prevent array underflow in evm_write_xattrs()Dan Carpenter2018-05-311-1/+1
| * | | EVM: Fix null dereference on xattr when xattr fails to allocateColin Ian King2018-05-311-2/+4
| * | | EVM: fix memory leak of temporary buffer 'temp'Colin Ian King2018-05-311-0/+2
| * | | IMA: use list_splice_tail_init_rcu() instead of its open coded variantPetko Manolov2018-05-311-15/+2
| * | | ima: use match_string() helperYisheng Xie2018-05-311-7/+4
| * | | ima: fix updating the ima_appraise flagMimi Zohar2018-05-221-9/+19
| * | | ima: based on policy verify firmware signatures (pre-allocated buffer)Mimi Zohar2018-05-221-0/+1
| * | | ima: define a new policy condition based on the filesystem nameMimi Zohar2018-05-221-1/+24
| * | | EVM: Allow runtime modification of the set of verified xattrsMatthew Garrett2018-05-184-4/+188
| * | | EVM: turn evm_config_xattrnames into a listMatthew Garrett2018-05-183-39/+57
| * | | integrity: Add an integrity directory in securityfsMatthew Garrett2018-05-174-4/+52
| * | | ima: Remove unused variable ima_initializedPetr Vorel2018-05-172-6/+2
| * | | ima: Unify loggingPetr Vorel2018-05-173-2/+9
| * | | ima: Reflect correct permissions for policyPetr Vorel2018-05-171-0/+2
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-06-062-2/+6
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-06-031-1/+1
| |\ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-05-261-4/+16
| |\ \ \ \
| * \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-05-211-22/+28
| |\ \ \ \ \
| * | | | | | net: initial AF_XDP skeletonBjörn Töpel2018-05-032-2/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge tag 'audit-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-06-066-14/+17
|\ \ \ \ \ \
| * | | | | | audit: use inline function to get audit contextRichard Guy Briggs2018-05-146-14/+17
* | | | | | | Merge tag 'selinux-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-06-061-6/+12
|\ \ \ \ \ \ \
| * | | | | | | audit: normalize MAC_POLICY_LOAD recordRichard Guy Briggs2018-04-171-1/+1
| * | | | | | | audit: normalize MAC_STATUS recordRichard Guy Briggs2018-04-171-4/+10
| * | | | | | | security: selinux: Change return type to vm_fault_tSouptick Joarder2018-04-161-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-06-065-23/+64
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | dh key: get rid of stack allocated array for zeroesTycho Andersen2018-05-111-3/+3
| * | | | | | dh key: get rid of stack allocated arrayTycho Andersen2018-05-111-19/+10
| * | | | | | big key: get rid of stack array allocationTycho Andersen2018-05-111-1/+10
| * | | | | | smack: provide socketpair callbackTom Gundersen2018-05-041-0/+22
| * | | | | | selinux: provide socketpair callbackDavid Herrmann2018-05-041-0/+13
| * | | | | | security: add hook for socketpair()David Herrmann2018-05-041-0/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-06-042-3/+8
|\ \ \ \ \ \
| * | | | | | capabilities: Allow privileged user in s_user_ns to set security.* xattrsEric W. Biederman2018-05-241-2/+6
| * | | | | | evm: Don't update hmacs in user ns mountsSeth Forshee2018-05-031-1/+2
| |/ / / / /
* | | | | | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-06-041-4/+3
|\ \ \ \ \ \
| * | | | | | __inode_security_revalidate() never gets NULL opt_dentryAl Viro2018-05-141-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2018-06-041-32/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | proc: introduce proc_create_seq{,_data}Christoph Hellwig2018-05-161-32/+2
| | |/ / / | |/| | |
* | | | | Merge tag 'selinux-pr-20180530' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-05-301-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | selinux: KASAN: slab-out-of-bounds in xattr_getsecuritySachin Grover2018-05-291-1/+1
* | | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsLinus Torvalds2018-05-211-4/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix breakage caused by d_find_alias() semantics changeAl Viro2018-05-131-4/+16
| | |_|/ | |/| |
* | | | Merge tag 'selinux-pr-20180516' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-05-171-22/+28
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | selinux: correctly handle sa_family cases in selinux_sctp_bind_connect()Alexey Kodanev2018-05-141-1/+2