netfilter: ebtables: abort if next_offset is too small

[safe/jmp/linux-2.6] / net / rds / tcp_listen.c

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 24b743e..53cb1b5 100644 (file)
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -66,12 +66,12 @@ static int rds_tcp_accept_one(struct socket *sock)
 
        inet = inet_sk(new_sock->sk);
 
-       rdsdebug("accepted tcp %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n",
-                 NIPQUAD(inet->saddr), ntohs(inet->sport),
-                 NIPQUAD(inet->daddr), ntohs(inet->dport));
+       rdsdebug("accepted tcp %pI4:%u -> %pI4:%u\n",
+                &inet->inet_saddr, ntohs(inet->inet_sport),
+                &inet->inet_daddr, ntohs(inet->inet_dport));
 
-       conn = rds_conn_create(inet->saddr, inet->daddr, &rds_tcp_transport,
-                              GFP_KERNEL);
+       conn = rds_conn_create(inet->inet_saddr, inet->inet_daddr,
+                              &rds_tcp_transport, GFP_KERNEL);
        if (IS_ERR(conn)) {
                ret = PTR_ERR(conn);
                goto out;