diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:31:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:31:04 +0200 |
| commit | 6d39b27f0ac7e805ae3bd9efa51d7da04bec0360 (patch) | |
| tree | 21a9cd29a07dd1afe70fe88f1343a0fa0fb0ed26 /security | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| parent | lsm: Use a compressed IPv6 string format in audit events (diff) | |
| download | linux-6d39b27f0ac7e805ae3bd9efa51d7da04bec0360.tar.xz linux-6d39b27f0ac7e805ae3bd9efa51d7da04bec0360.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
lsm: Use a compressed IPv6 string format in audit events
Audit: send signal info if selinux is disabled
Audit: rearrange audit_context to save 16 bytes per struct
Audit: reorganize struct audit_watch to save 8 bytes
Diffstat (limited to 'security')
| -rw-r--r-- | security/lsm_audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 500aad0ebd6a..3bb90b6f1dd3 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -187,7 +187,7 @@ static inline void print_ipv6_addr(struct audit_buffer *ab, char *name1, char *name2) { if (!ipv6_addr_any(addr)) - audit_log_format(ab, " %s=%pI6", name1, addr); + audit_log_format(ab, " %s=%pI6c", name1, addr); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); } |