- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 57737b8..7d12c6a 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -174,12 +174,12 @@ static int inet_autobind(struct sock *sk)
        /* We may need to bind the socket. */
        lock_sock(sk);
        inet = inet_sk(sk);
-       if (!inet->num) {
+       if (!inet->inet_num) {
                if (sk->sk_prot->get_port(sk, 0)) {
                        release_sock(sk);
                        return -EAGAIN;
                }
-               inet->sport = htons(inet->num);
+               inet->inet_sport = htons(inet->inet_num);
        }
        release_sock(sk);
        return 0;
@@ -262,7 +262,8 @@ static inline int inet_netns_ok(struct net *net, int protocol)
  *     Create an inet socket.
  */
 
-static int inet_create(struct net *net, struct socket *sock, int protocol)
+static int inet_create(struct net *net, struct socket *sock, int protocol,
+                      int kern)
 {
        struct sock *sk;
        struct inet_protosw *answer;
@@ -325,7 +326,7 @@ lookup_protocol:
        }
 
        err = -EPERM;
-       if (answer->capability > 0 && !capable(answer->capability))
+       if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
                goto out_rcu_unlock;
 
        err = -EAFNOSUPPORT;
@@ -354,7 +355,7 @@ lookup_protocol:
        inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;
 
        if (SOCK_RAW == sock->type) {
-               inet->num = protocol;
+               inet->inet_num = protocol;
                if (IPPROTO_RAW == protocol)
                        inet->hdrincl = 1;
        }
@@ -364,7 +365,7 @@ lookup_protocol:
        else
                inet->pmtudisc = IP_PMTUDISC_WANT;
 
-       inet->id = 0;
+       inet->inet_id = 0;
 
        sock_init_data(sock, sk);
 
@@ -381,13 +382,13 @@ lookup_protocol:
 
        sk_refcnt_debug_inc(sk);
 
-       if (inet->num) {
+       if (inet->inet_num) {
                /* It assumes that any protocol which allows
                 * the user to assign a number at socket
                 * creation time automatically
                 * shares.
                 */
-               inet->sport = htons(inet->num);
+               inet->inet_sport = htons(inet->inet_num);
                /* Add to protocol hash chains. */
                sk->sk_prot->hash(sk);
        }
@@ -494,27 +495,27 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
        /* Check these errors (active socket, double bind). */
        err = -EINVAL;
-       if (sk->sk_state != TCP_CLOSE || inet->num)
+       if (sk->sk_state != TCP_CLOSE || inet->inet_num)
                goto out_release_sock;
 
-       inet->rcv_saddr = inet->saddr = addr->sin_addr.s_addr;
+       inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
        if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
-               inet->saddr = 0;  /* Use device */
+               inet->inet_saddr = 0;  /* Use device */
 
        /* Make sure we are allowed to bind here. */
        if (sk->sk_prot->get_port(sk, snum)) {
-               inet->saddr = inet->rcv_saddr = 0;
+               inet->inet_saddr = inet->inet_rcv_saddr = 0;
                err = -EADDRINUSE;
                goto out_release_sock;
        }
 
-       if (inet->rcv_saddr)
+       if (inet->inet_rcv_saddr)
                sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
        if (snum)
                sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
-       inet->sport = htons(inet->num);
-       inet->daddr = 0;
-       inet->dport = 0;
+       inet->inet_sport = htons(inet->inet_num);
+       inet->inet_daddr = 0;
+       inet->inet_dport = 0;
        sk_dst_reset(sk);
        err = 0;
 out_release_sock:
@@ -532,7 +533,7 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
        if (uaddr->sa_family == AF_UNSPEC)
                return sk->sk_prot->disconnect(sk, flags);
 
-       if (!inet_sk(sk)->num && inet_autobind(sk))
+       if (!inet_sk(sk)->inet_num && inet_autobind(sk))
                return -EAGAIN;
        return sk->sk_prot->connect(sk, (struct sockaddr *)uaddr, addr_len);
 }
@@ -685,21 +686,21 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
 {
        struct sock *sk         = sock->sk;
        struct inet_sock *inet  = inet_sk(sk);
-       struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;
+       DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);
 
        sin->sin_family = AF_INET;
        if (peer) {
-               if (!inet->dport ||
+               if (!inet->inet_dport ||
                    (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_SYN_SENT)) &&
                     peer == 1))
                        return -ENOTCONN;
-               sin->sin_port = inet->dport;
-               sin->sin_addr.s_addr = inet->daddr;
+               sin->sin_port = inet->inet_dport;
+               sin->sin_addr.s_addr = inet->inet_daddr;
        } else {
-               __be32 addr = inet->rcv_saddr;
+               __be32 addr = inet->inet_rcv_saddr;
                if (!addr)
-                       addr = inet->saddr;
-               sin->sin_port = inet->sport;
+                       addr = inet->inet_saddr;
+               sin->sin_port = inet->inet_sport;
                sin->sin_addr.s_addr = addr;
        }
        memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
@@ -714,7 +715,7 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
        struct sock *sk = sock->sk;
 
        /* We may need to bind the socket. */
-       if (!inet_sk(sk)->num && inet_autobind(sk))
+       if (!inet_sk(sk)->inet_num && inet_autobind(sk))
                return -EAGAIN;
 
        return sk->sk_prot->sendmsg(iocb, sk, msg, size);
@@ -728,7 +729,7 @@ static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
        struct sock *sk = sock->sk;
 
        /* We may need to bind the socket. */
-       if (!inet_sk(sk)->num && inet_autobind(sk))
+       if (!inet_sk(sk)->inet_num && inet_autobind(sk))
                return -EAGAIN;
 
        if (sk->sk_prot->sendpage)
@@ -931,7 +932,7 @@ static const struct proto_ops inet_sockraw_ops = {
 #endif
 };
 
-static struct net_proto_family inet_family_ops = {
+static const struct net_proto_family inet_family_ops = {
        .family = PF_INET,
        .create = inet_create,
        .owner  = THIS_MODULE,
@@ -947,7 +948,6 @@ static struct inet_protosw inetsw_array[] =
                .protocol =   IPPROTO_TCP,
                .prot =       &tcp_prot,
                .ops =        &inet_stream_ops,
-               .capability = -1,
                .no_check =   0,
                .flags =      INET_PROTOSW_PERMANENT |
                              INET_PROTOSW_ICSK,
@@ -958,7 +958,6 @@ static struct inet_protosw inetsw_array[] =
                .protocol =   IPPROTO_UDP,
                .prot =       &udp_prot,
                .ops =        &inet_dgram_ops,
-               .capability = -1,
                .no_check =   UDP_CSUM_DEFAULT,
                .flags =      INET_PROTOSW_PERMANENT,
        },
@@ -969,7 +968,6 @@ static struct inet_protosw inetsw_array[] =
               .protocol =   IPPROTO_IP,        /* wild card */
               .prot =       &raw_prot,
               .ops =        &inet_sockraw_ops,
-              .capability = CAP_NET_RAW,
               .no_check =   UDP_CSUM_DEFAULT,
               .flags =      INET_PROTOSW_REUSE,
        }
@@ -1059,9 +1057,9 @@ static int inet_sk_reselect_saddr(struct sock *sk)
        struct inet_sock *inet = inet_sk(sk);
        int err;
        struct rtable *rt;
-       __be32 old_saddr = inet->saddr;
+       __be32 old_saddr = inet->inet_saddr;
        __be32 new_saddr;
-       __be32 daddr = inet->daddr;
+       __be32 daddr = inet->inet_daddr;
 
        if (inet->opt && inet->opt->srr)
                daddr = inet->opt->faddr;
@@ -1071,7 +1069,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
                               RT_CONN_FLAGS(sk),
                               sk->sk_bound_dev_if,
                               sk->sk_protocol,
-                              inet->sport, inet->dport, sk, 0);
+                              inet->inet_sport, inet->inet_dport, sk, 0);
        if (err)
                return err;
 
@@ -1087,7 +1085,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
                       __func__, &old_saddr, &new_saddr);
        }
 
-       inet->saddr = inet->rcv_saddr = new_saddr;
+       inet->inet_saddr = inet->inet_rcv_saddr = new_saddr;
 
        /*
         * XXX The only one ugly spot where we need to
@@ -1113,7 +1111,7 @@ int inet_sk_rebuild_header(struct sock *sk)
                return 0;
 
        /* Reroute. */
-       daddr = inet->daddr;
+       daddr = inet->inet_daddr;
        if (inet->opt && inet->opt->srr)
                daddr = inet->opt->faddr;
 {
@@ -1123,7 +1121,7 @@ int inet_sk_rebuild_header(struct sock *sk)
                .nl_u = {
                        .ip4_u = {
                                .daddr  = daddr,
-                               .saddr  = inet->saddr,
+                               .saddr  = inet->inet_saddr,
                                .tos    = RT_CONN_FLAGS(sk),
                        },
                },
@@ -1131,8 +1129,8 @@ int inet_sk_rebuild_header(struct sock *sk)
                .flags = inet_sk_flowi_flags(sk),
                .uli_u = {
                        .ports = {
-                               .sport = inet->sport,
-                               .dport = inet->dport,
+                               .sport = inet->inet_sport,
+                               .dport = inet->inet_dport,
                        },
                },
        };