diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-05-05 13:13:10 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-06 10:35:59 +1000 |
| commit | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (patch) | |
| tree | 995e13b947c55572cdac70a02e6cf169a6cc4f99 /security | |
| parent | e5e520a715dcea6b72f6b9417b203a4b1e813a8b (diff) | |
| download | linux-07ff7a0b187f3951788f64ae1f30e8109bc8e9eb.tar.gz linux-07ff7a0b187f3951788f64ae1f30e8109bc8e9eb.tar.bz2 linux-07ff7a0b187f3951788f64ae1f30e8109bc8e9eb.zip | |
integrity: remove __setup auditing msgs
Remove integrity audit messages from __setup()
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_audit.c | 13 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 16 |
2 files changed, 4 insertions, 25 deletions
diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c index c1461150691c..b628eea477a6 100644 --- a/security/integrity/ima/ima_audit.c +++ b/security/integrity/ima/ima_audit.c @@ -22,18 +22,9 @@ static int ima_audit; static int __init ima_audit_setup(char *str) { unsigned long audit; - int rc, result = 0; - char *op = "ima_audit"; - char *cause; - rc = strict_strtoul(str, 0, &audit); - if (rc || audit > 1) - result = 1; - else - ima_audit = audit; - cause = ima_audit ? "enabled" : "not_enabled"; - integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL, - op, cause, result, 0); + if (!strict_strtoul(str, 0, &audit)) + ima_audit = audit ? 1 : 0; return 1; } __setup("ima_audit=", ima_audit_setup); diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index f4e7266f5aee..122f17fc7fc1 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -29,20 +29,8 @@ int ima_initialized; char *ima_hash = "sha1"; static int __init hash_setup(char *str) { - const char *op = "hash_setup"; - const char *hash = "sha1"; - int result = 0; - int audit_info = 0; - - if (strncmp(str, "md5", 3) == 0) { - hash = "md5"; - ima_hash = str; - } else if (strncmp(str, "sha1", 4) != 0) { - hash = "invalid_hash_type"; - result = 1; - } - integrity_audit_msg(AUDIT_INTEGRITY_HASH, NULL, NULL, op, hash, - result, audit_info); + if (strncmp(str, "md5", 3) == 0) + ima_hash = "md5"; return 1; } __setup("ima_hash=", hash_setup); |