Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[safe/jmp/linux-2.6] / security / lsm_audit.c

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 51bd0fd..acba3df 100644 (file)
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -273,11 +273,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                        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");
-                               print_ipv4_addr(ab, inet->daddr,
-                                               inet->dport,
+                               print_ipv4_addr(ab, inet->inet_daddr,
+                                               inet->inet_dport,
                                                "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,
-                                               inet->sport,
+                                               inet->inet_sport,
                                                "laddr", "lport");
                                print_ipv6_addr(ab, &inet6->daddr,
-                                               inet->dport,
+                                               inet->inet_dport,
                                                "faddr", "fport");
                                break;
                        }