lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

X25 remove bkl in call user data length ioctl

Browse Source 
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
andrew hendry
2010-11-25 02:18:45 +00:00
committed by David S. Miller
parent 74a7e44080
commit 3f0a069a1d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/x25/af_x25.c
View File

@@ -1562,19 +1562,20 @@ out_dtefac_release:
case SIOCX25SCUDMATCHLEN: { case SIOCX25SCUDMATCHLEN: {
struct x25_subaddr sub_addr; struct x25_subaddr sub_addr;
rc = -EINVAL; rc = -EINVAL;
lock_kernel(); lock_sock(sk);
if(sk->sk_state != TCP_CLOSE) if(sk->sk_state != TCP_CLOSE)
break; goto out_cud_release;
rc = -EFAULT; rc = -EFAULT;
if (copy_from_user(&sub_addr, argp, if (copy_from_user(&sub_addr, argp,
sizeof(sub_addr))) sizeof(sub_addr)))
break; goto out_cud_release;
rc = -EINVAL; rc = -EINVAL;
if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN) if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN)
break; goto out_cud_release;
x25->cudmatchlength = sub_addr.cudmatchlength; x25->cudmatchlength = sub_addr.cudmatchlength;
unlock_kernel();
rc = 0; rc = 0;
out_cud_release:
release_sock(sk);
break; break;
} }