summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2019-01-056-741/+459Star
|\
| * smack: rewrite smack_sb_eat_lsm_opts()Al Viro2018-12-211-85/+23Star
| * smack: get rid of match_token()Al Viro2018-12-211-18/+38
| * smack: take the guts of smack_parse_opts_str() into a new helperAl Viro2018-12-211-57/+57
| * LSM: new method: ->sb_add_mnt_opt()Al Viro2018-12-213-30/+24Star
| * selinux: rewrite selinux_sb_eat_lsm_opts()Al Viro2018-12-211-92/+54Star
| * selinux: regularize Opt_... names a bitAl Viro2018-12-211-8/+8
| * selinux: switch away from match_token()Al Viro2018-12-211-27/+55
| * selinux: new helper - selinux_add_opt()Al Viro2018-12-211-73/+53Star
| * smack: switch to private smack_mnt_optsAl Viro2018-12-211-102/+55Star
| * selinux: switch to private struct selinux_mnt_optsAl Viro2018-12-211-161/+101Star
| * LSM: hide struct security_mnt_opts from any generic codeAl Viro2018-12-213-32/+85
| * selinux: kill selinux_sb_get_mnt_opts()Al Viro2018-12-211-147/+51Star
| * LSM: turn sb_eat_lsm_opts() into a methodAl Viro2018-12-213-12/+31
| * btrfs: sanitize security_mnt_opts useAl Viro2018-12-211-0/+1
| * selinux; don't open-code a loop in sb_finish_set_opts()Al Viro2018-12-211-4/+2Star
| * LSM: split ->sb_set_mnt_opts() out of ->sb_kern_mount()Al Viro2018-12-213-27/+3Star
| * new helper: security_sb_eat_lsm_opts()Al Viro2018-12-211-3/+12
| * LSM: lift extracting and parsing LSM options into the caller of ->sb_remount()Al Viro2018-12-212-37/+15Star
| * LSM: lift parsing LSM options into the caller of ->sb_kern_mount()Al Viro2018-12-213-43/+9Star
| * smack: make smack_parse_opts_str() clean up on failureAl Viro2018-12-211-0/+1
| * selinux: expand superblock_doinit() callsAl Viro2018-12-201-30/+24Star
| * vfs: Suppress MS_* flag defs within the kernel unless explicitly enabledDavid Howells2018-12-204-0/+4
* | Remove 'type' argument from access_ok() functionLinus Torvalds2019-01-041-1/+1
* | 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-141-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/+2Star
| * | | | | 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-131-1/+1
| | * | | | ima: Support platform keyring for kernel appraisalNayna Jain2018-12-131-2/+12
| | * | | | efi: Allow the "db" UEFI variable to be suppressedJosh Boyer2018-12-131-10/+35
| | * | | | efi: Import certificates from UEFI Secure BootJosh Boyer2018-12-132-1/+173
| | * | | | efi: Add an EFI signature blob parserDave Howells2018-12-132-1/+110
| | * | | | integrity: Load certs to the platform keyringNayna Jain2018-12-133-24/+86
| | * | | | integrity: Define a trusted platform keyringNayna Jain2018-12-135-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-212-10/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2018-12-291-1/+1
|\ \ \ \ \