diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 72c65d938a150e6794b1a769070843ec5c5fa32a..65cf07bba5817060b1c323aa8af5e283a74e40e7 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -701,25 +701,30 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        struct net_device *dev;
        ax25_address *source;
        ax25_uid_assoc *user;
+       int err = -EINVAL;
        int n;
 
+
+       lock_sock(sk);
        if (!sock_flag(sk, SOCK_ZAPPED))
-               return -EINVAL;
+               goto out_release;
 
        if (addr_len != sizeof(struct sockaddr_rose) && addr_len != sizeof(struct full_sockaddr_rose))
-               return -EINVAL;
+               goto out_release;
 
        if (addr->srose_family != AF_ROSE)
-               return -EINVAL;
+               goto out_release;
 
        if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)
-               return -EINVAL;
+               goto out_release;
 
        if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS)
-               return -EINVAL;
+               goto out_release;
 
-       if ((dev = rose_dev_get(&addr->srose_addr)) == NULL)
-               return -EADDRNOTAVAIL;
+       err = -EADDRNOTAVAIL;
+       dev = rose_dev_get(&addr->srose_addr);
+       if (!dev)
+               goto out_release;
 
        source = &addr->srose_call;
 
@@ -730,7 +735,8 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        } else {
                if (ax25_uid_policy && !capable(CAP_NET_BIND_SERVICE)) {
                        dev_put(dev);
-                       return -EACCES;
+                       err = -EACCES;
+                       goto out_release;
                }
                rose->source_call   = *source;
        }
@@ -753,8 +759,10 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        rose_insert_socket(sk);
 
        sock_reset_flag(sk, SOCK_ZAPPED);
-
-       return 0;
+       err = 0;
+out_release:
+       release_sock(sk);
+       return err;
 }
 
 static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags)