diff options
| author | James Morris <james.morris@microsoft.com> | 2019-04-12 15:20:23 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-04-12 15:20:23 -0700 |
| commit | 2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d (patch) | |
| tree | e3abbdd39c488daec66a7c7b6d93e34b51145e54 /Documentation | |
| parent | fe9fd2ef383c2f5883fcd3f7adce0de9ce2556ff (diff) | |
| parent | 41475a3ebaceb270e47a77356ddc30960354cb00 (diff) | |
| download | linux-2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d.tar.bz2 | |
Merge branch 'next-integrity-for-james' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-integrity
From Mimi:
"This pull request contains just three patches, the remainder are
either included in other pull requests (eg. audit, lockdown) or will
be upstreamed via other subsystems (eg. kselftests, Power). Included
in this pull request is one bug fix, one documentation update, and
extending the x86 IMA arch policy rules to coordinate the different
kernel module signature verification methods."
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2b8ee90bb644..45147fc40a57 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1585,7 +1585,7 @@ Format: { "off" | "enforce" | "fix" | "log" } default: "enforce" - ima_appraise_tcb [IMA] + ima_appraise_tcb [IMA] Deprecated. Use ima_policy= instead. The builtin appraise policy appraises all files owned by uid=0. @@ -1612,8 +1612,7 @@ uid=0. The "appraise_tcb" policy appraises the integrity of - all files owned by root. (This is the equivalent - of ima_appraise_tcb.) + all files owned by root. The "secure_boot" policy appraises the integrity of files (eg. kexec kernel image, kernel modules, |