Commit 45189a19 authored by Stephen Smalley's avatar Stephen Smalley Committed by Paul Moore

selinux: fix avc audit messages

commit a2c51383 ("selinux: inline some AVC functions used only once")
introduced usage of audit_log_string() in place of audit_log_format()
for fixed strings.  However, audit_log_string() quotes the string.
This breaks the avc audit message format and userspace audit parsers.
Switch back to using audit_log_format().

Fixes: a2c51383 ("selinux: inline some AVC functions used only once")
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent e6f2f381
...@@ -674,13 +674,13 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a) ...@@ -674,13 +674,13 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a)
audit_log_format(ab, "avc: %s ", sad->denied ? "denied" : "granted"); audit_log_format(ab, "avc: %s ", sad->denied ? "denied" : "granted");
if (av == 0) { if (av == 0) {
audit_log_string(ab, " null"); audit_log_format(ab, " null");
return; return;
} }
perms = secclass_map[sad->tclass-1].perms; perms = secclass_map[sad->tclass-1].perms;
audit_log_string(ab, " {"); audit_log_format(ab, " {");
i = 0; i = 0;
perm = 1; perm = 1;
while (i < (sizeof(av) * 8)) { while (i < (sizeof(av) * 8)) {
...@@ -695,7 +695,7 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a) ...@@ -695,7 +695,7 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a)
if (av) if (av)
audit_log_format(ab, " 0x%x", av); audit_log_format(ab, " 0x%x", av);
audit_log_string(ab, " } for "); audit_log_format(ab, " } for ");
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment