llc: only change llc->dev when bind() succeeds

[linux-2.6-microblaze.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index c862560..7f555d2 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -275,6 +275,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
 {
        struct sock *sk = sock->sk;
        struct llc_sock *llc = llc_sk(sk);
+       struct net_device *dev = NULL;
        struct llc_sap *sap;
        int rc = -EINVAL;
 
@@ -286,16 +287,15 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
                goto out;
        rc = -ENODEV;
        if (sk->sk_bound_dev_if) {
-               llc->dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
-               if (llc->dev && addr->sllc_arphrd != llc->dev->type) {
-                       dev_put(llc->dev);
-                       llc->dev = NULL;
+               dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
+               if (dev && addr->sllc_arphrd != dev->type) {
+                       dev_put(dev);
+                       dev = NULL;
                }
        } else
-               llc->dev = dev_getfirstbyhwtype(&init_net, addr->sllc_arphrd);
-       if (!llc->dev)
+               dev = dev_getfirstbyhwtype(&init_net, addr->sllc_arphrd);
+       if (!dev)
                goto out;
-       netdev_tracker_alloc(llc->dev, &llc->dev_tracker, GFP_KERNEL);
        rc = -EUSERS;
        llc->laddr.lsap = llc_ui_autoport();
        if (!llc->laddr.lsap)
@@ -304,6 +304,12 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
        sap = llc_sap_open(llc->laddr.lsap, NULL);
        if (!sap)
                goto out;
+
+       /* Note: We do not expect errors from this point. */
+       llc->dev = dev;
+       netdev_tracker_alloc(llc->dev, &llc->dev_tracker, GFP_KERNEL);
+       dev = NULL;
+
        memcpy(llc->laddr.mac, llc->dev->dev_addr, IFHWADDRLEN);
        memcpy(&llc->addr, addr, sizeof(llc->addr));
        /* assign new connection to its SAP */
@@ -311,10 +317,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
        sock_reset_flag(sk, SOCK_ZAPPED);
        rc = 0;
 out:
-       if (rc) {
-               dev_put_track(llc->dev, &llc->dev_tracker);
-               llc->dev = NULL;
-       }
+       dev_put(dev);
        return rc;
 }
 
@@ -337,6 +340,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
        struct sockaddr_llc *addr = (struct sockaddr_llc *)uaddr;
        struct sock *sk = sock->sk;
        struct llc_sock *llc = llc_sk(sk);
+       struct net_device *dev = NULL;
        struct llc_sap *sap;
        int rc = -EINVAL;
 
@@ -352,25 +356,27 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
        rc = -ENODEV;
        rcu_read_lock();
        if (sk->sk_bound_dev_if) {
-               llc->dev = dev_get_by_index_rcu(&init_net, sk->sk_bound_dev_if);
-               if (llc->dev) {
+               dev = dev_get_by_index_rcu(&init_net, sk->sk_bound_dev_if);
+               if (dev) {
                        if (is_zero_ether_addr(addr->sllc_mac))
-                               memcpy(addr->sllc_mac, llc->dev->dev_addr,
+                               memcpy(addr->sllc_mac, dev->dev_addr,
                                       IFHWADDRLEN);
-                       if (addr->sllc_arphrd != llc->dev->type ||
+                       if (addr->sllc_arphrd != dev->type ||
                            !ether_addr_equal(addr->sllc_mac,
-                                             llc->dev->dev_addr)) {
+                                             dev->dev_addr)) {
                                rc = -EINVAL;
-                               llc->dev = NULL;
+                               dev = NULL;
                        }
                }
-       } else
-               llc->dev = dev_getbyhwaddr_rcu(&init_net, addr->sllc_arphrd,
+       } else {
+               dev = dev_getbyhwaddr_rcu(&init_net, addr->sllc_arphrd,
                                           addr->sllc_mac);
-       dev_hold_track(llc->dev, &llc->dev_tracker, GFP_ATOMIC);
+       }
+       dev_hold(dev);
        rcu_read_unlock();
-       if (!llc->dev)
+       if (!dev)
                goto out;
+
        if (!addr->sllc_sap) {
                rc = -EUSERS;
                addr->sllc_sap = llc_ui_autoport();
@@ -402,6 +408,12 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
                        goto out_put;
                }
        }
+
+       /* Note: We do not expect errors from this point. */
+       llc->dev = dev;
+       netdev_tracker_alloc(llc->dev, &llc->dev_tracker, GFP_KERNEL);
+       dev = NULL;
+
        llc->laddr.lsap = addr->sllc_sap;
        memcpy(llc->laddr.mac, addr->sllc_mac, IFHWADDRLEN);
        memcpy(&llc->addr, addr, sizeof(llc->addr));
@@ -412,10 +424,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
 out_put:
        llc_sap_put(sap);
 out:
-       if (rc) {
-               dev_put_track(llc->dev, &llc->dev_tracker);
-               llc->dev = NULL;
-       }
+       dev_put(dev);
        release_sock(sk);
        return rc;
 }