Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54aafbd4 authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25: remove bkl in inq and outq ioctls 



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

net/x25/af_x25.c

+2 −4
Original line number Diff line number Diff line
@@ -1361,12 +1361,10 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		case TIOCOUTQ: {

			int amount;



			lock_kernel();

			amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);

			if (amount < 0)

				amount = 0;

			rc = put_user(amount, (unsigned int __user *)argp);

			unlock_kernel();

			break;

		}
@@ -1377,11 +1375,11 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			 * These two are safe on a single CPU system as

			 * only user tasks fiddle here

			 */

			lock_kernel();

			lock_sock(sk);

			if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)

				amount = skb->len;

			release_sock(sk);

			rc = put_user(amount, (unsigned int __user *)argp);

			unlock_kernel();

			break;

		}