summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-08-04 17:52:00 +0200
committerStefan Agner <stefan.agner@toradex.com>2015-08-04 17:52:00 +0200
commit073b50be0713f8cba043935e1daae714e66026db (patch)
treeed0a71b56576df2637ffa9a4d3dae8d836b63428 /Documentation/kernel-parameters.txt
parent3a5c56b021108a9c2aeead3109946cd4f2fc7078 (diff)
parent89e419960fb6a260f6a112821507d516117d5aa1 (diff)
Merge tag 'v4.1.4' into toradex_vf_4.1-next
This is the 4.1.4 stable release
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6726139bd289..cd03a0faca8f 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