summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-08-1512-46/+108
|\
| * EVM: fix return value check in evm_write_xattrs()Wei Yongjun2018-07-221-2/+2
| * integrity: prevent deadlock during digsig verification.Mikhail Kurinnoi2018-07-182-1/+29
| * evm: Allow non-SHA1 digital signaturesMatthew Garrett2018-07-184-31/+46
| * evm: Don't deadlock if a crypto algorithm is unavailableMatthew Garrett2018-07-181-1/+2
| * integrity: silence warning when CONFIG_SECURITYFS is not enabledSudeep Holla2018-07-181-3/+6
| * ima: Differentiate auditing policy rules from "audit" actionsStefan Berger2018-07-181-2/+2
| * ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not setStefan Berger2018-07-183-1/+21
| * ima: Use audit_log_format() rather than audit_log_string()Stefan Berger2018-07-182-7/+2
| * ima: Call audit_log_string() rather than logging it untrustedStefan Berger2018-07-181-1/+1
* | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2018-08-154-16/+10
|\ \
| * | ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL insteadStefan Berger2018-07-284-8/+4
| * | ima: Use tpm_default_chip() and call TPM functions with a tpm_chipStefan Berger2018-07-284-9/+7
| |/
* | Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2018-08-151-6/+16
|\ \
| * \ Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack i...James Morris2018-07-301-6/+16
| |\ \ | | |/ | |/|
| | * Smack: Inform peer that IPv6 traffic has been blockedPiotr Sawicki2018-07-231-0/+4
| | * Smack: Check UDP-Lite and DCCP protocols during IPv6 handlingPiotr Sawicki2018-07-231-1/+3
| | * Smack: Fix handling of IPv4 traffic received by PF_INET6 socketsPiotr Sawicki2018-07-231-5/+9
* | | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2018-08-151-1/+1
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxHerbert Xu2018-08-033-47/+38
| |\ \ \
| * | | | crypto: remove redundant type flags from tfm allocationEric Biggers2018-07-091-1/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-08-151-1/+1
|\ \ \ \ \
| * | | | | net: sched: introduce chain object to uapiJiri Pirko2018-07-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge tag 'kbuild-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2018-08-151-1/+1
|\ \ \ \ \
| * | | | | kbuild: move bin2c back to scripts/ from scripts/basic/Masahiro Yamada2018-07-181-1/+1
| |/ / / /
* | | | | Merge tag 'selinux-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-08-1513-189/+198
|\ \ \ \ \
| * | | | | selinux: cleanup dentry and inodes on error in selinuxfsnixiaoming2018-08-071-8/+25
| * | | | | selinux: constify write_op[]Eric Biggers2018-07-171-1/+1
| * | | | | selinux: Cleanup printk logging in netnodepeter enderborg2018-06-191-3/+2
| * | | | | selinux: Cleanup printk logging in avcpeter enderborg2018-06-191-1/+1
| * | | | | selinux: Cleanup printk logging in netifpeter enderborg2018-06-191-7/+4
| * | | | | selinux: Cleanup printk logging in netportpeter enderborg2018-06-191-3/+2
| * | | | | selinux: Cleanup printk logging in sidtabpeter enderborg2018-06-191-3/+2
| * | | | | selinux: Cleanup printk logging in netlinkpeter enderborg2018-06-191-1/+1
| * | | | | selinux: Cleanup printk logging in selinuxfspeter enderborg2018-06-191-5/+5
| * | | | | selinux: Cleanup printk logging in servicespeter enderborg2018-06-191-36/+35
| * | | | | selinux: Cleanup printk logging in avtabpeter enderborg2018-06-191-25/+26
| * | | | | selinux: Cleanup printk logging in hookspeter enderborg2018-06-191-35/+33
| * | | | | selinux: Cleanup printk logging in policydbpeter enderborg2018-06-191-45/+46
| * | | | | selinux: Cleanup printk logging in ebitmappeter enderborg2018-06-191-8/+7
| * | | | | selinux: Cleanup printk logging in conditionalpeter enderborg2018-06-191-8/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-08-157-17/+192
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | security: check for kstrdup() failure in lsm_append()Eric Biggers2018-07-171-0/+2
| * | | | security: export security_kernel_load_data functionArnd Bergmann2018-07-171-0/+1
| | |_|/ | |/| |
| * | | ima: based on policy warn about loading firmware (pre-allocated buffer)Mimi Zohar2018-07-161-0/+8
| * | | module: replace the existing LSM hook in init_moduleMimi Zohar2018-07-163-13/+31
| * | | ima: add build time policyMimi Zohar2018-07-162-3/+101
| * | | ima: based on policy require signed firmware (sysfs fallback)Mimi Zohar2018-07-161-1/+9
| * | | ima: based on policy require signed kexec kernel imagesMimi Zohar2018-07-164-1/+36
| * | | security: define new LSM hook named security_kernel_load_dataMimi Zohar2018-07-161-0/+5
| |/ /