1 files changed, 8 insertions, 2 deletions

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 8346a4f7c5d7..a99be508f93d 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -739,14 +739,20 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a)
         rc = security_sid_to_context_inval(sad->state, sad->ssid, &scontext,
                                            &scontext_len);
         if (!rc && scontext) {
-                audit_log_format(ab, " srawcon=%s", scontext);
+                if (scontext_len && scontext[scontext_len - 1] == '\0')
+                        scontext_len--;
+                audit_log_format(ab, " srawcon=");
+                audit_log_n_untrustedstring(ab, scontext, scontext_len);
                 kfree(scontext);
         }
 
         rc = security_sid_to_context_inval(sad->state, sad->tsid, &scontext,
                                            &scontext_len);
         if (!rc && scontext) {
-                audit_log_format(ab, " trawcon=%s", scontext);
+                if (scontext_len && scontext[scontext_len - 1] == '\0')
+                        scontext_len--;
+                audit_log_format(ab, " trawcon=");
+                audit_log_n_untrustedstring(ab, scontext, scontext_len);
                 kfree(scontext);
         }
 }