Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / security / lsm_audit.c

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 37f04dadc8d6c8f2189efbaf1b75f4b112fd6b3f..28d4c3a528abce522c4c274c9233cfc03f3eadc2 100644 (file)
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -410,6 +410,22 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                audit_log_format(ab, " kmod=");
                audit_log_untrustedstring(ab, a->u.kmod_name);
                break;
+       case LSM_AUDIT_DATA_IBPKEY: {
+               struct in6_addr sbn_pfx;
+
+               memset(&sbn_pfx.s6_addr, 0,
+                      sizeof(sbn_pfx.s6_addr));
+               memcpy(&sbn_pfx.s6_addr, &a->u.ibpkey->subnet_prefix,
+                      sizeof(a->u.ibpkey->subnet_prefix));
+               audit_log_format(ab, " pkey=0x%x subnet_prefix=%pI6c",
+                                a->u.ibpkey->pkey, &sbn_pfx);
+               break;
+       }
+       case LSM_AUDIT_DATA_IBENDPORT:
+               audit_log_format(ab, " device=%s port_num=%u",
+                                a->u.ibendport->dev_name,
+                                a->u.ibendport->port);
+               break;
        } /* switch (a->type) */
 }