leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X25 remove bkl from calluserdata ioctls

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:40 +00:00 committed by David S. Miller
parent f90de66067
commit 5b7958dfa5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/x25/af_x25.c
View File

@ -1512,11 +1512,11 @@ out_dtefac_release:
} }
case SIOCX25GCALLUSERDATA: { case SIOCX25GCALLUSERDATA: {
struct x25_calluserdata cud = x25->calluserdata; lock_sock(sk);
lock_kernel(); rc = copy_to_user(argp, &x25->calluserdata,
rc = copy_to_user(argp, &cud, sizeof(x25->calluserdata))
sizeof(cud)) ? -EFAULT : 0; ? -EFAULT : 0;
unlock_kernel(); release_sock(sk);
break; break;
} }
@ -1524,15 +1524,15 @@ out_dtefac_release:
struct x25_calluserdata calluserdata; struct x25_calluserdata calluserdata;
rc = -EFAULT; rc = -EFAULT;
lock_kernel();
if (copy_from_user(&calluserdata, argp, if (copy_from_user(&calluserdata, argp,
sizeof(calluserdata))) sizeof(calluserdata)))
break; break;
rc = -EINVAL; rc = -EINVAL;
if (calluserdata.cudlength > X25_MAX_CUD_LEN) if (calluserdata.cudlength > X25_MAX_CUD_LEN)
break; break;
lock_sock(sk);
x25->calluserdata = calluserdata; x25->calluserdata = calluserdata;
unlock_kernel(); release_sock(sk);
rc = 0; rc = 0;
break; break;
} }