git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: xtables: use xt_table for hook instantiation
[safe/jmp/linux-2.6]
/
security
/
lsm_audit.c
diff --git
a/security/lsm_audit.c
b/security/lsm_audit.c
index
500aad0
..
acba3df
100644
(file)
--- 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))
char *name1, char *name2)
{
if (!ipv6_addr_any(addr))
- audit_log_format(ab, " %s=%pI6", name1, addr);
+ audit_log_format(ab, " %s=%pI6
c
", name1, addr);
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
@@
-273,11
+273,11
@@
static void dump_common_audit_data(struct audit_buffer *ab,
case AF_INET: {
struct inet_sock *inet = inet_sk(sk);
case AF_INET: {
struct inet_sock *inet = inet_sk(sk);
- print_ipv4_addr(ab, inet->rcv_saddr,
- inet->sport,
+ print_ipv4_addr(ab, inet->
inet_
rcv_saddr,
+ inet->
inet_
sport,
"laddr", "lport");
"laddr", "lport");
- print_ipv4_addr(ab, inet->daddr,
- inet->dport,
+ print_ipv4_addr(ab, inet->
inet_
daddr,
+ inet->
inet_
dport,
"faddr", "fport");
break;
}
"faddr", "fport");
break;
}
@@
-286,10
+286,10
@@
static void dump_common_audit_data(struct audit_buffer *ab,
struct ipv6_pinfo *inet6 = inet6_sk(sk);
print_ipv6_addr(ab, &inet6->rcv_saddr,
struct ipv6_pinfo *inet6 = inet6_sk(sk);
print_ipv6_addr(ab, &inet6->rcv_saddr,
- inet->sport,
+ inet->
inet_
sport,
"laddr", "lport");
print_ipv6_addr(ab, &inet6->daddr,
"laddr", "lport");
print_ipv6_addr(ab, &inet6->daddr,
- inet->dport,
+ inet->
inet_
dport,
"faddr", "fport");
break;
}
"faddr", "fport");
break;
}
@@
-354,6
+354,10
@@
static void dump_common_audit_data(struct audit_buffer *ab,
}
break;
#endif
}
break;
#endif
+ case LSM_AUDIT_DATA_KMOD:
+ audit_log_format(ab, " kmod=");
+ audit_log_untrustedstring(ab, a->u.kmod_name);
+ break;
} /* switch (a->type) */
}
} /* switch (a->type) */
}