X25 remove bkl from causediag ioctls
Subsystems (3)
PATCH 4/5 X25 remove bkl from causediag ioctls
Signed-off-by Andrew Hendry <[email protected]>
--- net/x25/af_x25.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
net/x25/af_x25.c +7 -8
@@ -1538,23 +1538,22 @@ out_dtefac_release: }case SIOCX25GCAUSEDIAG : { -struct x25_causediag causediag; -lock_kernel (); - causediag = x25->causediag; - rc =copy_to_user (argp, &causediag, -sizeof (causediag)) ? -EFAULT :0 ; -unlock_kernel (); +lock_sock (sk); + rc =copy_to_user (argp, &x25->causediag, +sizeof (x25->causediag)) + ? -EFAULT :0 ; +release_sock (sk);break ; }case SIOCX25SCAUSEDIAG : {struct x25_causediag causediag; rc = -EFAULT ; -lock_kernel ();if (copy_from_user (&causediag, argp,sizeof (causediag)))break ; +lock_sock (sk); x25->causediag = causediag; -unlock_kernel (); +release_sock (sk); rc =0 ;break ;
Signature · 1 line
1.7.1
From: Andrew Hendry <[email protected]>
Date: Thu, 25 Nov 2010 23:18:43 +1100
Quoted 2 lines
Signed-off-by Andrew Hendry <[email protected]>
Applied.