Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 46 insertions, 42 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index e127a32f9540..3f9e86b15e0d 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -36,6 +36,7 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include <linux/inet.h>
 #include <linux/netdevice.h>
@@ -95,7 +96,8 @@ static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
         return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
 }
 
-static int inet6_create(struct net *net, struct socket *sock, int protocol)
+static int inet6_create(struct net *net, struct socket *sock, int protocol,
+                        int kern)
 {
         struct inet_sock *inet;
         struct ipv6_pinfo *np;
@@ -158,7 +160,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;
 
         sock->ops = answer->ops;
@@ -185,7 +187,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;
         }
@@ -198,7 +200,7 @@ lookup_protocol:
 
         inet_sk(sk)->pinet6 = np = inet6_sk_generic(sk);
         np->hop_limit   = -1;
-        np->mcast_hops  = -1;
+        np->mcast_hops  = IPV6_DEFAULT_MCASTHOPS;
         np->mc_loop     = 1;
         np->pmtudisc    = IPV6_PMTUDISC_WANT;
         np->ipv6only    = net->ipv6.sysctl.bindv6only;
@@ -228,12 +230,12 @@ 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);
                 sk->sk_prot->hash(sk);
         }
         if (sk->sk_prot->init) {
@@ -281,7 +283,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         lock_sock(sk);
 
         /* Check these errors (active socket, double bind). */
-        if (sk->sk_state != TCP_CLOSE || inet->num) {
+        if (sk->sk_state != TCP_CLOSE || inet->inet_num) {
                 err = -EINVAL;
                 goto out;
         }
@@ -314,6 +316,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                 if (addr_type != IPV6_ADDR_ANY) {
                         struct net_device *dev = NULL;
 
+                        rcu_read_lock();
                         if (addr_type & IPV6_ADDR_LINKLOCAL) {
                                 if (addr_len >= sizeof(struct sockaddr_in6) &&
                                     addr->sin6_scope_id) {
@@ -326,12 +329,12 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                                 /* Binding to link-local address requires an interface */
                                 if (!sk->sk_bound_dev_if) {
                                         err = -EINVAL;
-                                        goto out;
+                                        goto out_unlock;
                                 }
-                                dev = dev_get_by_index(net, sk->sk_bound_dev_if);
+                                dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
                                 if (!dev) {
                                         err = -ENODEV;
-                                        goto out;
+                                        goto out_unlock;
                                 }
                         }
 
@@ -342,19 +345,16 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                         if (!(addr_type & IPV6_ADDR_MULTICAST)) {
                                 if (!ipv6_chk_addr(net, &addr->sin6_addr,
                                                    dev, 0)) {
-                                        if (dev)
-                                                dev_put(dev);
                                         err = -EADDRNOTAVAIL;
-                                        goto out;
+                                        goto out_unlock;
                                 }
                         }
-                        if (dev)
-                                dev_put(dev);
+                        rcu_read_unlock();
                 }
         }
 
-        inet->rcv_saddr = v4addr;
-        inet->saddr = v4addr;
+        inet->inet_rcv_saddr = v4addr;
+        inet->inet_saddr = v4addr;
 
         ipv6_addr_copy(&np->rcv_saddr, &addr->sin6_addr);
 
@@ -375,12 +375,15 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         }
         if (snum)
                 sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
-        inet->sport = htons(inet->num);
-        inet->dport = 0;
-        inet->daddr = 0;
+        inet->inet_sport = htons(inet->inet_num);
+        inet->inet_dport = 0;
+        inet->inet_daddr = 0;
 out:
         release_sock(sk);
         return err;
+out_unlock:
+        rcu_read_unlock();
+        goto out;
 }
 
 EXPORT_SYMBOL(inet6_bind);
@@ -441,12 +444,12 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
         sin->sin6_flowinfo = 0;
         sin->sin6_scope_id = 0;
         if (peer) {
-                if (!inet->dport)
+                if (!inet->inet_dport)
                         return -ENOTCONN;
                 if (((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_SYN_SENT)) &&
                     peer == 1)
                         return -ENOTCONN;
-                sin->sin6_port = inet->dport;
+                sin->sin6_port = inet->inet_dport;
                 ipv6_addr_copy(&sin->sin6_addr, &np->daddr);
                 if (np->sndflow)
                         sin->sin6_flowinfo = np->flow_label;
@@ -456,7 +459,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
                 else
                         ipv6_addr_copy(&sin->sin6_addr, &np->rcv_saddr);
 
-                sin->sin6_port = inet->sport;
+                sin->sin6_port = inet->inet_sport;
         }
         if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL)
                 sin->sin6_scope_id = sk->sk_bound_dev_if;
@@ -552,7 +555,7 @@ const struct proto_ops inet6_dgram_ops = {
 #endif
 };
 
-static struct net_proto_family inet6_family_ops = {
+static const struct net_proto_family inet6_family_ops = {
         .family = PF_INET6,
         .create = inet6_create,
         .owner  = THIS_MODULE,
@@ -654,8 +657,9 @@ int inet6_sk_rebuild_header(struct sock *sk)
                 ipv6_addr_copy(&fl.fl6_src, &np->saddr);
                 fl.fl6_flowlabel = np->flow_label;
                 fl.oif = sk->sk_bound_dev_if;
-                fl.fl_ip_dport = inet->dport;
-                fl.fl_ip_sport = inet->sport;
+                fl.mark = sk->sk_mark;
+                fl.fl_ip_dport = inet->inet_dport;
+                fl.fl_ip_sport = inet->inet_sport;
                 security_sk_classify_flow(sk, &fl);
 
                 if (np->opt && np->opt->srcrt) {
@@ -968,41 +972,41 @@ static void ipv6_packet_cleanup(void)
 
 static int __net_init ipv6_init_mibs(struct net *net)
 {
-        if (snmp_mib_init((void **)net->mib.udp_stats_in6,
+        if (snmp_mib_init((void __percpu **)net->mib.udp_stats_in6,
                           sizeof (struct udp_mib)) < 0)
                 return -ENOMEM;
-        if (snmp_mib_init((void **)net->mib.udplite_stats_in6,
+        if (snmp_mib_init((void __percpu **)net->mib.udplite_stats_in6,
                           sizeof (struct udp_mib)) < 0)
                 goto err_udplite_mib;
-        if (snmp_mib_init((void **)net->mib.ipv6_statistics,
+        if (snmp_mib_init((void __percpu **)net->mib.ipv6_statistics,
                           sizeof(struct ipstats_mib)) < 0)
                 goto err_ip_mib;
-        if (snmp_mib_init((void **)net->mib.icmpv6_statistics,
+        if (snmp_mib_init((void __percpu **)net->mib.icmpv6_statistics,
                           sizeof(struct icmpv6_mib)) < 0)
                 goto err_icmp_mib;
-        if (snmp_mib_init((void **)net->mib.icmpv6msg_statistics,
+        if (snmp_mib_init((void __percpu **)net->mib.icmpv6msg_statistics,
                           sizeof(struct icmpv6msg_mib)) < 0)
                 goto err_icmpmsg_mib;
         return 0;
 
 err_icmpmsg_mib:
-        snmp_mib_free((void **)net->mib.icmpv6_statistics);
+        snmp_mib_free((void __percpu **)net->mib.icmpv6_statistics);
 err_icmp_mib:
-        snmp_mib_free((void **)net->mib.ipv6_statistics);
+        snmp_mib_free((void __percpu **)net->mib.ipv6_statistics);
 err_ip_mib:
-        snmp_mib_free((void **)net->mib.udplite_stats_in6);
+        snmp_mib_free((void __percpu **)net->mib.udplite_stats_in6);
 err_udplite_mib:
-        snmp_mib_free((void **)net->mib.udp_stats_in6);
+        snmp_mib_free((void __percpu **)net->mib.udp_stats_in6);
         return -ENOMEM;
 }
 
-static void __net_exit ipv6_cleanup_mibs(struct net *net)
+static void ipv6_cleanup_mibs(struct net *net)
 {
-        snmp_mib_free((void **)net->mib.udp_stats_in6);
-        snmp_mib_free((void **)net->mib.udplite_stats_in6);
-        snmp_mib_free((void **)net->mib.ipv6_statistics);
-        snmp_mib_free((void **)net->mib.icmpv6_statistics);
-        snmp_mib_free((void **)net->mib.icmpv6msg_statistics);
+        snmp_mib_free((void __percpu **)net->mib.udp_stats_in6);
+        snmp_mib_free((void __percpu **)net->mib.udplite_stats_in6);
+        snmp_mib_free((void __percpu **)net->mib.ipv6_statistics);
+        snmp_mib_free((void __percpu **)net->mib.icmpv6_statistics);
+        snmp_mib_free((void __percpu **)net->mib.icmpv6msg_statistics);
 }
 
 static int __net_init inet6_net_init(struct net *net)
@@ -1039,7 +1043,7 @@ out:
 #endif
 }
 
-static void inet6_net_exit(struct net *net)
+static void __net_exit inet6_net_exit(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
         udp6_proc_exit(net);