net/rose: Fix to not accept on connected socket

[linux-2.6-block.git] / net / rose / af_rose.c

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 36fefc3957d772257755f9e5b90e71e423370ca5..ca2b17f32670dc232ebaeced139782d0ccb4e899 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -488,6 +488,12 @@ static int rose_listen(struct socket *sock, int backlog)
 {
        struct sock *sk = sock->sk;
 
+       lock_sock(sk);
+       if (sock->state != SS_UNCONNECTED) {
+               release_sock(sk);
+               return -EINVAL;
+       }
+
        if (sk->sk_state != TCP_LISTEN) {
                struct rose_sock *rose = rose_sk(sk);
 
@@ -497,8 +503,10 @@ static int rose_listen(struct socket *sock, int backlog)
                memset(rose->dest_digis, 0, AX25_ADDR_LEN * ROSE_MAX_DIGIS);
                sk->sk_max_ack_backlog = backlog;
                sk->sk_state           = TCP_LISTEN;
+               release_sock(sk);
                return 0;
        }
+       release_sock(sk);
 
        return -EOPNOTSUPP;
 }