---

yaml --- r: 214521 b: refs/heads/master c: 141646c h: refs/heads/master i: 214519: b469dde v: v3
git-mirror · Sep 15, 2010 · c6b6889 · c6b6889
1 parent 2ed25f5
commit c6b6889
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90c27297a9bfb8ea11c0e3f73ad90c4c66e8501e
+refs/heads/master: 141646ce56735cedb2336b3cd21364287f0aa4c7
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
@@ -869,15 +869,18 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
 	struct sk_buff *skb;
 	int rc = -EINVAL;
 
-	lock_kernel();
-	if (!sk || sk->sk_state != TCP_LISTEN)
+	if (!sk)
 		goto out;
 
 	rc = -EOPNOTSUPP;
 	if (sk->sk_type != SOCK_SEQPACKET)
 		goto out;
 
 	lock_sock(sk);
+	rc = -EINVAL;
+	if (sk->sk_state != TCP_LISTEN)
+		goto out2;
+
 	rc = x25_wait_for_data(sk, sk->sk_rcvtimeo);
 	if (rc)
 		goto out2;
@@ -897,7 +900,6 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
 out2:
 	release_sock(sk);
 out:
-	unlock_kernel();
 	return rc;
 }