Commit 07ff7a0b authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

integrity: remove __setup auditing msgs 



Remove integrity audit messages from __setup()

Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent e5e520a7

security/integrity/ima/ima_audit.c

+2 −11
Original line number Diff line number Diff line
@@ -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);

security/integrity/ima/ima_main.c

+2 −14
Original line number Diff line number Diff line
@@ -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);