Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

integrity: use audit_log_string 



Based on a request from Eric Paris to simplify parsing, replace
audit_log_format statements containing "%s" with audit_log_string().

Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 53fc0e22

security/integrity/ima/ima_audit.c

+4 −13
Original line number Diff line number Diff line
@@ -54,19 +54,10 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode, 
			 audit_get_loginuid(current),

			 audit_get_sessionid(current));

	audit_log_task_context(ab);

	switch (audit_msgno) {

	case AUDIT_INTEGRITY_DATA:

	case AUDIT_INTEGRITY_METADATA:

	case AUDIT_INTEGRITY_PCR:

	case AUDIT_INTEGRITY_STATUS:

		audit_log_format(ab, " op=%s cause=%s", op, cause);

		break;

	case AUDIT_INTEGRITY_HASH:

		audit_log_format(ab, " op=%s hash=%s", op, cause);

		break;

	default:

		audit_log_format(ab, " op=%s", op);

	}

	audit_log_format(ab, " op=");

	audit_log_string(ab, op);

	audit_log_format(ab, " cause=");

	audit_log_string(ab, cause);

	audit_log_format(ab, " comm=");

	audit_log_untrustedstring(ab, current->comm);

	if (fname) {