diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /security/lsm_audit.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'security/lsm_audit.c')
-rw-r--r-- | security/lsm_audit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 9a62045..8d8d97d 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -302,19 +302,18 @@ static void dump_common_audit_data(struct audit_buffer *ab, "faddr", "fport"); break; } -#if IS_ENABLED(CONFIG_IPV6) case AF_INET6: { struct inet_sock *inet = inet_sk(sk); + struct ipv6_pinfo *inet6 = inet6_sk(sk); - print_ipv6_addr(ab, &sk->sk_v6_rcv_saddr, + print_ipv6_addr(ab, &inet6->rcv_saddr, inet->inet_sport, "laddr", "lport"); - print_ipv6_addr(ab, &sk->sk_v6_daddr, + print_ipv6_addr(ab, &inet6->daddr, inet->inet_dport, "faddr", "fport"); break; } -#endif case AF_UNIX: u = unix_sk(sk); if (u->path.dentry) { @@ -397,8 +396,7 @@ void common_lsm_audit(struct common_audit_data *a, if (a == NULL) return; /* we use GFP_ATOMIC so we won't sleep */ - ab = audit_log_start(current->audit_context, GFP_ATOMIC | __GFP_NOWARN, - AUDIT_AVC); + ab = audit_log_start(current->audit_context, GFP_ATOMIC, AUDIT_AVC); if (ab == NULL) return; |