Merge tag 'audit-pr-20200803' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[sfrench/cifs-2.6.git] / security / apparmor / net.c

diff --git a/security/apparmor/net.c b/security/apparmor/net.c
index d8afc39f663ac6d5b54d2508bc6e3d2a0b78d42e..fa0e85568450b0e7b942d576460499b425a1f61a 100644 (file)
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
@@ -72,16 +72,18 @@ void audit_net_cb(struct audit_buffer *ab, void *va)
 {
        struct common_audit_data *sa = va;
 
-       audit_log_format(ab, " family=");
        if (address_family_names[sa->u.net->family])
-               audit_log_string(ab, address_family_names[sa->u.net->family]);
+               audit_log_format(ab, " family=\"%s\"",
+                                address_family_names[sa->u.net->family]);
        else
-               audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family);
-       audit_log_format(ab, " sock_type=");
+               audit_log_format(ab, " family=\"unknown(%d)\"",
+                                sa->u.net->family);
        if (sock_type_names[aad(sa)->net.type])
-               audit_log_string(ab, sock_type_names[aad(sa)->net.type]);
+               audit_log_format(ab, " sock_type=\"%s\"",
+                                sock_type_names[aad(sa)->net.type]);
        else
-               audit_log_format(ab, "\"unknown(%d)\"", aad(sa)->net.type);
+               audit_log_format(ab, " sock_type=\"unknown(%d)\"",
+                                aad(sa)->net.type);
        audit_log_format(ab, " protocol=%d", aad(sa)->net.protocol);
 
        if (aad(sa)->request & NET_PERMS_MASK) {