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>

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 22597838cc76f0175e7253dd4bfdd79e22ecbce7..2f235a6cb3b18f81bc7b1d285305421119986227 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1361,12 +1361,10 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                case TIOCOUTQ: {
                        int amount;
 
                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);
                        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;
                }
 
                        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
                         */
                         * 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;
                        if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
                                amount = skb->len;

+                       release_sock(sk);

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

-                       unlock_kernel();

                        break;
                }
 
                        break;
                }