---

yaml --- r: 224514 b: refs/heads/master c: 3f0a069 h: refs/heads/master v: v3
git-mirror · Nov 28, 2010 · 70de4b7 · 70de4b7
1 parent 391f9f9
commit 70de4b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74a7e440807d34e586e9feb8e14851b5c80fbfe5
+refs/heads/master: 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
@@ -1562,19 +1562,20 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 		case SIOCX25SCUDMATCHLEN: {
 			struct x25_subaddr sub_addr;
 			rc = -EINVAL;
-			lock_kernel();
+			lock_sock(sk);
 			if(sk->sk_state != TCP_CLOSE)
-				break;
+				goto out_cud_release;
 			rc = -EFAULT;
 			if (copy_from_user(&sub_addr, argp,
 					sizeof(sub_addr)))
-				break;
+				goto out_cud_release;
 			rc = -EINVAL;
 			if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN)
-				break;
+				goto out_cud_release;
 			x25->cudmatchlength = sub_addr.cudmatchlength;
-			unlock_kernel();
 			rc = 0;
+out_cud_release:
+			release_sock(sk);
 			break;
 		}