diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | security/integrity/ima/ima.h | 5 | ||||
-rw-r--r-- | security/integrity/ima/ima_appraise.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 90c12c591168..2aa1b6e74aca 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1292,7 +1292,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
1292 | Set number of hash buckets for inode cache. | 1292 | Set number of hash buckets for inode cache. |
1293 | 1293 | ||
1294 | ima_appraise= [IMA] appraise integrity measurements | 1294 | ima_appraise= [IMA] appraise integrity measurements |
1295 | Format: { "off" | "enforce" | "fix" } | 1295 | Format: { "off" | "enforce" | "fix" | "log" } |
1296 | default: "enforce" | 1296 | default: "enforce" |
1297 | 1297 | ||
1298 | ima_appraise_tcb [IMA] | 1298 | ima_appraise_tcb [IMA] |
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 8e4bb883fc13..d61680dcd365 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
@@ -159,8 +159,9 @@ void ima_delete_rules(void); | |||
159 | /* Appraise integrity measurements */ | 159 | /* Appraise integrity measurements */ |
160 | #define IMA_APPRAISE_ENFORCE 0x01 | 160 | #define IMA_APPRAISE_ENFORCE 0x01 |
161 | #define IMA_APPRAISE_FIX 0x02 | 161 | #define IMA_APPRAISE_FIX 0x02 |
162 | #define IMA_APPRAISE_MODULES 0x04 | 162 | #define IMA_APPRAISE_LOG 0x04 |
163 | #define IMA_APPRAISE_FIRMWARE 0x08 | 163 | #define IMA_APPRAISE_MODULES 0x08 |
164 | #define IMA_APPRAISE_FIRMWARE 0x10 | ||
164 | 165 | ||
165 | #ifdef CONFIG_IMA_APPRAISE | 166 | #ifdef CONFIG_IMA_APPRAISE |
166 | int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, | 167 | int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, |
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 013ec3f0e42d..2dc13fbb7e91 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c | |||
@@ -23,6 +23,8 @@ static int __init default_appraise_setup(char *str) | |||
23 | { | 23 | { |
24 | if (strncmp(str, "off", 3) == 0) | 24 | if (strncmp(str, "off", 3) == 0) |
25 | ima_appraise = 0; | 25 | ima_appraise = 0; |
26 | else if (strncmp(str, "log", 3) == 0) | ||
27 | ima_appraise = IMA_APPRAISE_LOG; | ||
26 | else if (strncmp(str, "fix", 3) == 0) | 28 | else if (strncmp(str, "fix", 3) == 0) |
27 | ima_appraise = IMA_APPRAISE_FIX; | 29 | ima_appraise = IMA_APPRAISE_FIX; |
28 | return 1; | 30 | return 1; |