mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
X25: remove bkl in inq and outq ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1ecd66bf2c
commit
54aafbd498
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user