Bluetooth: ISO: convert to getsockopt_iter

Convert ISO socket's getsockopt implementation to use the new
getsockopt_iter callback with sockopt_t.

Key changes:
- Replace (char __user *optval, int __user *optlen) with sockopt_t *opt
- Use opt->optlen for buffer length (input) and returned size (output)
- Use copy_to_iter() instead of put_user()/copy_to_user()
- Add linux/uio.h for copy_to_iter()

Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 3abd8111dda83bc761ecf40971901055de63ef12..793a481d7066ad2f8bd8e4592e49df64f722609c 100644 (file)
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -10,6 +10,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/sched/signal.h>
+#include <linux/uio.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -1882,18 +1883,17 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
 }
 
 static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
-                              char __user *optval, int __user *optlen)
+                              sockopt_t *opt)
 {
        struct sock *sk = sock->sk;
-       int len, err = 0;
        struct bt_iso_qos *qos;
+       int len, val, err = 0;
        u8 base_len;
        u8 *base;
 
        BT_DBG("sk %p", sk);
 
-       if (get_user(len, optlen))
-               return -EFAULT;
+       len = opt->optlen;
 
        lock_sock(sk);
 
@@ -1904,15 +1904,17 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
                        break;
                }
 
-               if (put_user(test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags),
-                            (u32 __user *)optval))
+               val = test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
+               if (copy_to_iter(&val, sizeof(val), &opt->iter_out) !=
+                   sizeof(val))
                        err = -EFAULT;
 
                break;
 
        case BT_PKT_STATUS:
-               if (put_user(test_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags),
-                            (int __user *)optval))
+               val = test_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
+               if (copy_to_iter(&val, sizeof(val), &opt->iter_out) !=
+                   sizeof(val))
                        err = -EFAULT;
                break;
 
@@ -1920,7 +1922,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
                qos = iso_sock_get_qos(sk);
 
                len = min_t(unsigned int, len, sizeof(*qos));
-               if (copy_to_user(optval, qos, len))
+               if (copy_to_iter(qos, len, &opt->iter_out) != len)
                        err = -EFAULT;
 
                break;
@@ -1936,9 +1938,8 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
                }
 
                len = min_t(unsigned int, len, base_len);
-               if (copy_to_user(optval, base, len))
-                       err = -EFAULT;
-               if (put_user(len, optlen))
+               opt->optlen = len;
+               if (copy_to_iter(base, len, &opt->iter_out) != len)
                        err = -EFAULT;
 
                break;
@@ -2705,7 +2706,7 @@ static const struct proto_ops iso_sock_ops = {
        .socketpair     = sock_no_socketpair,
        .shutdown       = iso_sock_shutdown,
        .setsockopt     = iso_sock_setsockopt,
-       .getsockopt     = iso_sock_getsockopt
+       .getsockopt_iter = iso_sock_getsockopt
 };
 
 static const struct net_proto_family iso_sock_family_ops = {