ALSA: hda - fix DG45ID SPDIF output

[safe/jmp/linux-2.6] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 52ed7d7..ed31c37 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -249,7 +249,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
        /* Raw sockets are IPv6 only */
        if (addr_type == IPV6_ADDR_MAPPED)
-               return(-EADDRNOTAVAIL);
+               return -EADDRNOTAVAIL;
 
        lock_sock(sk);
 
@@ -257,6 +257,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
        if (sk->sk_state != TCP_CLOSE)
                goto out;
 
+       rcu_read_lock();
        /* Check if the address belongs to the host. */
        if (addr_type != IPV6_ADDR_ANY) {
                struct net_device *dev = NULL;
@@ -272,13 +273,13 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
                        /* Binding to link-local address requires an interface */
                        if (!sk->sk_bound_dev_if)
-                               goto out;
+                               goto out_unlock;
 
-                       dev = dev_get_by_index(sock_net(sk), sk->sk_bound_dev_if);
-                       if (!dev) {
-                               err = -ENODEV;
-                               goto out;
-                       }
+                       err = -ENODEV;
+                       dev = dev_get_by_index_rcu(sock_net(sk),
+                                                  sk->sk_bound_dev_if);
+                       if (!dev)
+                               goto out_unlock;
                }
 
                /* ipv4 addr of the socket is invalid.  Only the
@@ -289,13 +290,9 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                        err = -EADDRNOTAVAIL;
                        if (!ipv6_chk_addr(sock_net(sk), &addr->sin6_addr,
                                           dev, 0)) {
-                               if (dev)
-                                       dev_put(dev);
-                               goto out;
+                               goto out_unlock;
                        }
                }
-               if (dev)
-                       dev_put(dev);
        }
 
        inet->inet_rcv_saddr = inet->inet_saddr = v4addr;
@@ -303,6 +300,8 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
        if (!(addr_type & IPV6_ADDR_MULTICAST))
                ipv6_addr_copy(&np->saddr, &addr->sin6_addr);
        err = 0;
+out_unlock:
+       rcu_read_unlock();
 out:
        release_sock(sk);
        return err;
@@ -517,7 +516,6 @@ csum_copy_err:
           as some normal condition.
         */
        err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
-       atomic_inc(&sk->sk_drops);
        goto out;
 }
 
@@ -1277,7 +1275,7 @@ static const struct file_operations raw6_seq_fops = {
        .release =      seq_release_net,
 };
 
-static int raw6_init_net(struct net *net)
+static int __net_init raw6_init_net(struct net *net)
 {
        if (!proc_net_fops_create(net, "raw6", S_IRUGO, &raw6_seq_fops))
                return -ENOMEM;
@@ -1285,7 +1283,7 @@ static int raw6_init_net(struct net *net)
        return 0;
 }
 
-static void raw6_exit_net(struct net *net)
+static void __net_exit raw6_exit_net(struct net *net)
 {
        proc_net_remove(net, "raw6");
 }
@@ -1337,7 +1335,6 @@ static struct inet_protosw rawv6_protosw = {
        .protocol       = IPPROTO_IP,   /* wild card */
        .prot           = &rawv6_prot,
        .ops            = &inet6_sockraw_ops,
-       .capability     = CAP_NET_RAW,
        .no_check       = UDP_CSUM_DEFAULT,
        .flags          = INET_PROTOSW_REUSE,
 };