Commit 74a7e440 authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25 remove bkl from causediag ioctls 



Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b7958df

net/x25/af_x25.c

+7 −8
Original line number Diff line number Diff line
@@ -1538,23 +1538,22 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		}



		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;