diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-06-18 23:28:40 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-06-18 23:28:40 +1000 |
| commit | b3bddffd35a0b77eee89760eb94cafa18dc431f5 (patch) | |
| tree | 58c0f6c79c121dfbe91f2058210c79d7ee25acc2 /Documentation/kernel-parameters.txt | |
| parent | tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() (diff) | |
| parent | ima: update builtin policies (diff) | |
| download | linux-dev-b3bddffd35a0b77eee89760eb94cafa18dc431f5.tar.xz linux-dev-b3bddffd35a0b77eee89760eb94cafa18dc431f5.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index abc496f95220..807b765087d4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1398,7 +1398,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. The list of supported hash algorithms is defined in crypto/hash_info.h. - ima_tcb [IMA] + ima_policy= [IMA] + The builtin measurement policy to load during IMA + setup. Specyfing "tcb" as the value, measures all + programs exec'd, files mmap'd for exec, and all files + opened with the read mode bit set by either the + effective uid (euid=0) or uid=0. + Format: "tcb" + + ima_tcb [IMA] Deprecated. Use ima_policy= instead. Load a policy which meets the needs of the Trusted Computing Base. This means IMA will measure all programs exec'd, files mmap'd for exec, and all files |