summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell2020-03-231-1/+1
|\
| * Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi...Ingo Molnar2020-02-261-1/+1
| |\
| | * integrity: Check properly whether EFI GetVariable() is availableArd Biesheuvel2020-02-231-1/+1
* | | Merge remote-tracking branch 'tpmdd/next'Stephen Rothwell2020-03-232-3/+3
|\ \ \
| * | | KEYS: reaching the keys quotas correctlyYang Xu2020-03-152-3/+3
| |/ /
* | | Merge remote-tracking branch 'selinux/next'Stephen Rothwell2020-03-2318-444/+445
|\ \ \
| * | | selinux: avtab_init() and cond_policydb_init() return voidPaul Moore2020-03-055-21/+7
| * | | selinux: clean up error path in policydb_init()Ondrej Mosnacek2020-03-051-13/+5
| * | | selinux: remove unused initial SIDs and improve handlingStephen Smalley2020-02-274-56/+58
| * | | selinux: reduce the use of hard-coded hash sizesOndrej Mosnacek2020-02-274-40/+45
| * | | selinux: Add xfs quota command typesRichard Haines2020-02-221-0/+7
| * | | selinux: optimize storage of filename transitionsOndrej Mosnacek2020-02-223-80/+110
| * | | selinux: factor out loop body from filename_trans_read()Ondrej Mosnacek2020-02-131-59/+63
| * | | security: selinux: allow per-file labeling for bpffsConnor O'Brien2020-02-111-0/+1
| * | | selinux: generalize evaluate_cond_node()Ondrej Mosnacek2020-02-113-6/+12
| * | | selinux: convert cond_expr to arrayOndrej Mosnacek2020-02-112-43/+33
| * | | selinux: convert cond_av_list to arrayOndrej Mosnacek2020-02-112-79/+53
| * | | selinux: convert cond_list to arrayOndrej Mosnacek2020-02-117-59/+43
| * | | selinux: sel_avc_get_stat_idx should increase position indexVasily Averin2020-02-101-0/+1
| * | | selinux: allow kernfs symlinks to inherit parent directory contextChristian Göttsche2020-02-103-2/+13
| * | | selinux: simplify evaluate_cond_node()Ondrej Mosnacek2020-02-103-13/+6
| * | | Documentation,selinux: deprecate setting checkreqprot to 1Stephen Smalley2020-02-103-1/+15
| * | | selinux: move status variables out of selinux_ssOndrej Mosnacek2020-02-106-22/+23
| | |/ | |/|
* | | Merge remote-tracking branch 'keys/keys-next'Stephen Rothwell2020-03-2311-28/+300
|\ \ \
| * | | smack: Implement the watch_key and post_notification hooksDavid Howells2020-02-121-1/+82
| * | | selinux: Implement the watch_key security hookDavid Howells2020-02-121-0/+14
| * | | keys: Add a notification facilityDavid Howells2020-02-128-27/+181
| * | | security: Add a hook for the point of notification insertionDavid Howells2020-02-121-0/+9
| * | | security: Add hooks to rule on setting a watchDavid Howells2020-02-121-0/+14
| |/ /
* | | Merge remote-tracking branch 'integrity/next-integrity'Stephen Rothwell2020-03-2319-34/+19
|\ \ \
| * | | ima: add a new CONFIG for loading arch-specific policiesNayna Jain2020-03-121-0/+7
| * | | integrity: Remove duplicate pr_fmt definitionsTushar Sugandhi2020-02-2817-31/+6
| * | | IMA: Add log statements for failure conditionsTushar Sugandhi2020-02-281-0/+3
| * | | IMA: Update KBUILD_MODNAME for IMA files to imaTushar Sugandhi2020-02-281-3/+3
| | |/ | |/|
* | | Merge remote-tracking branch 'apparmor/apparmor-next'Stephen Rothwell2020-03-238-71/+130
|\ \ \ | |/ / |/| |
| * | apparmor: remove duplicate check of xattrs on profile attachment.John Johansen2020-01-211-17/+0
| * | apparmor: add outofband transition and use it in xattr matchJohn Johansen2020-01-214-7/+62
| * | apparmor: fail unpack if profile mode is unknownJohn Johansen2020-01-211-0/+4
| * | apparmor: fix nnp subset test for unconfinedJohn Johansen2020-01-213-4/+39
| * | apparmor: remove useless aafs_create_symlinkJohn Johansen2020-01-211-41/+9
| * | apparmor: add consistency check between state and dfa diff encode flagsJohn Johansen2020-01-181-0/+6
| * | apparmor: add a valid state flags checkJohn Johansen2020-01-182-0/+8
| * | AppArmor: Remove semicolonVasyl Gomonovych2020-01-181-1/+1
| * | apparmor: Replace two seq_printf() calls by seq_puts() in aa_label_seq_xprint()Markus Elfring2020-01-181-2/+2
* | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2020-02-202-14/+31
|\ \ \
| * | | ima: add sm3 algorithm to hash algorithm configuration listTianjia Zhang2020-02-181-0/+5
| * | | efi: Only print errors about failing to get certs if EFI vars are foundJavier Martinez Canillas2020-02-181-14/+26
| | |/ | |/|
* | | Merge tag 'selinux-pr-20200210' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2020-02-102-10/+4
|\ \ \ | |/ / |/| |
| * | selinux: fix sidtab string cache lockingOndrej Mosnacek2020-02-051-9/+3
| * | selinux: fix typo in filesystem nameHridya Valsaraju2020-02-051-1/+1