summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2019-01-021-2/+3
|\
| * Merge tag 'tpmdd-next-20181217' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-12-171-2/+3
| |\
| | * tpm: use u32 instead of int for PCR indexTomas Winkler2018-11-131-2/+3
* | | Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2019-01-021-3/+9
|\ \ \
| * \ \ Merge branch 'smack-for-4.21-a' of https://github.com/cschaufler/next-smack i...James Morris2018-12-131-3/+9
| |\ \ \
| | * | | smack: fix access permissions for keyringZoran Markovic2018-12-031-3/+9
| | | |/ | | |/|
* | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2019-01-0211-92/+633
|\ \ \ \
| * | | | integrity: Remove references to module keyringThiago Jung Bauermann2018-12-172-4/+2
| * | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2018-12-1711-91/+634
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | ima: Use inode_is_open_for_writeNikolay Borisov2018-12-121-1/+1
| | * | | ima: Support platform keyring for kernel appraisalNayna Jain2018-12-121-2/+12
| | * | | efi: Allow the "db" UEFI variable to be suppressedJosh Boyer2018-12-121-10/+35
| | * | | efi: Import certificates from UEFI Secure BootJosh Boyer2018-12-122-1/+173
| | * | | efi: Add an EFI signature blob parserDave Howells2018-12-122-1/+110
| | * | | integrity: Load certs to the platform keyringNayna Jain2018-12-123-24/+86
| | * | | integrity: Define a trusted platform keyringNayna Jain2018-12-125-16/+81
| | * | | ima: don't measure/appraise files on efivarfsMimi Zohar2018-12-111-1/+3
| | * | | x86/ima: define arch_get_ima_policy() for x86Eric Richter2018-12-111-1/+9
| | * | | ima: add support for arch specific policiesNayna Jain2018-12-111-2/+70
| | * | | ima: refactor ima_init_policy()Nayna Jain2018-12-111-41/+56
| | * | | ima: prevent kexec_load syscall based on runtime secureboot flagNayna Jain2018-12-111-6/+13
| | * | | integrity: support new struct public_key_signature encoding fieldMimi Zohar2018-11-131-0/+1
| | | |/ | | |/|
* | | | KEYS: fix parsing invalid pkey info stringEric Biggers2019-01-011-0/+2
* | | | Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ma...Linus Torvalds2018-12-292-10/+10
|\ \ \ \
| * | | | treewide: surround Kconfig file paths with double quotesMasahiro Yamada2018-12-222-10/+10
* | | | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2018-12-281-1/+1
|\ \ \ \ \
| * | | | | mm: convert totalram_pages and totalhigh_pages variables to atomicArun KS2018-12-281-1/+1
* | | | | | Merge tag 'libnvdimm-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2018-12-283-11/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | keys-encrypted: add nvdimm key format type to encrypted keysDave Jiang2018-12-131-9/+20
| * | | | | keys: Export lookup_user_key to external usersDave Jiang2018-12-132-2/+1
* | | | | | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2018-12-274-7/+6
|\ \ \ \ \ \
| * | | | | | crypto: drop mask=CRYPTO_ALG_ASYNC from 'shash' tfm allocationsEric Biggers2018-11-204-7/+6
| | |/ / / / | |/| | | |
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-12-271-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-12-203-7/+7
| |\ \ \ \ \ \
| * | | | | | | net: use skb_sec_path helper in more placesFlorian Westphal2018-12-191-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-12-2729-39/+22
|\ \ \ \ \ \ \
| * | | | | | | security: integrity: partial revert of make ima_main explicitly non-modularPaul Gortmaker2018-12-201-1/+1
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge tag 'v4.20-rc7' into next-generalJames Morris2018-12-174-4/+23
| |\| | | | | | | |_|_|_|/ | |/| | | |
| * | | | | security: fs: make inode explicitly non-modularPaul Gortmaker2018-12-121-4/+2
| * | | | | security: audit and remove any unnecessary uses of module.hPaul Gortmaker2018-12-1224-24/+14
| * | | | | security: integrity: make evm_main explicitly non-modularPaul Gortmaker2018-12-121-4/+1
| * | | | | keys: remove needless modular infrastructure from ecryptfs_formatPaul Gortmaker2018-12-121-3/+2
| * | | | | security: integrity: make ima_main explicitly non-modularPaul Gortmaker2018-12-121-4/+3
| | |_|_|/ | |/| | |
| * | | | Merge tag 'v4.20-rc2' into next-generalJames Morris2018-11-1239-326/+880
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | tomoyo: fix small typoYangtao Li2018-11-051-1/+1
* | | | | Merge tag 'selinux-pr-20181224' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-12-279-396/+625
|\ \ \ \ \
| * | | | | selinux: overhaul sidtab to fix bug and improve performanceOndrej Mosnacek2018-12-055-324/+468
| * | | | | selinux: use separate table for initial SID lookupOndrej Mosnacek2018-12-055-110/+173
| * | | | | selinux: make "selinux_policycap_names[]" const char *Alexey Dobriyan2018-11-262-2/+2
| * | | | | selinux: always allow mounting submountsOndrej Mosnacek2018-11-261-1/+1