Skip to contentSkip to conversation

X25 remove bkl in call user data length ioctl

PATCH Applied Andrew Hendry 2 participants 2 messages Nov 25, 2010 – Nov 28, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 5/5 X25 remove bkl in call user data length ioctl

---
 net/x25/af_x25.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
net/x25/af_x25.c +6 -5
index 8cfc419..ad96ee9 100644
@@ -1562,19 +1562,20 @@ out_dtefac_release:
 		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;
 		}
 
Signature · 1 line
1.7.1