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

X25 remove bkl from causediag 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:43 +00:00
committed by David S. Miller
parent 5b7958dfa5
commit 74a7e44080
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/x25/af_x25.c
View File

@@ -1538,23 +1538,22 @@ out_dtefac_release:
} }
case SIOCX25GCAUSEDIAG: { case SIOCX25GCAUSEDIAG: {
struct x25_causediag causediag; lock_sock(sk);
lock_kernel(); rc = copy_to_user(argp, &x25->causediag,
causediag = x25->causediag; sizeof(x25->causediag))
rc = copy_to_user(argp, &causediag, ? -EFAULT : 0;
sizeof(causediag)) ? -EFAULT : 0; release_sock(sk);
unlock_kernel();
break; break;
} }
case SIOCX25SCAUSEDIAG: { case SIOCX25SCAUSEDIAG: {
struct x25_causediag causediag; struct x25_causediag causediag;
rc = -EFAULT; rc = -EFAULT;
lock_kernel();
if (copy_from_user(&causediag, argp, sizeof(causediag))) if (copy_from_user(&causediag, argp, sizeof(causediag)))
break; break;
lock_sock(sk);
x25->causediag = causediag; x25->causediag = causediag;
unlock_kernel(); release_sock(sk);
rc = 0; rc = 0;
break; break;