Commit 5b7958df authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25 remove bkl from calluserdata ioctls 



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

net/x25/af_x25.c

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



		case SIOCX25GCALLUSERDATA: {

			struct x25_calluserdata cud = x25->calluserdata;

			lock_kernel();

			rc = copy_to_user(argp, &cud,

					  sizeof(cud)) ? -EFAULT : 0;

			unlock_kernel();

			lock_sock(sk);

			rc = copy_to_user(argp, &x25->calluserdata,

					sizeof(x25->calluserdata))

					? -EFAULT : 0;

			release_sock(sk);

			break;

		}
@@ -1524,15 +1524,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			struct x25_calluserdata calluserdata;



			rc = -EFAULT;

			lock_kernel();

			if (copy_from_user(&calluserdata, argp,

					   sizeof(calluserdata)))

				break;

			rc = -EINVAL;

			if (calluserdata.cudlength > X25_MAX_CUD_LEN)

				break;

			lock_sock(sk);

			x25->calluserdata = calluserdata;

			unlock_kernel();

			release_sock(sk);

			rc = 0;

			break;

		}