net: switch sock_set_timeout to sockptr_t

Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 62e18fc8ac9f96926bcfa2071d9577a59895680c..bfb2fe2fc3687686e440e13bf53cd37cc660aa6f 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -59,6 +59,7 @@
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
 #include <linux/poll.h>
+#include <linux/sockptr.h>
 
 #include <linux/atomic.h>
 #include <linux/refcount.h>
@@ -1669,7 +1670,7 @@ void sock_pfree(struct sk_buff *skb);
 #endif
 
 int sock_setsockopt(struct socket *sock, int level, int op,
-                   char __user *optval, unsigned int optlen);
+                   sockptr_t optval, unsigned int optlen);
 
 int sock_getsockopt(struct socket *sock, int level, int op,
                    char __user *optval, int __user *optlen);

diff --git a/net/core/sock.c b/net/core/sock.c
index 8b9eddaff868a5c27c54c0226bc474f5bbdad062..1444d7d53ba2fdec21123ed5c0219e195a67dc88 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -826,7 +826,7 @@ EXPORT_SYMBOL(sock_set_rcvbuf);
  */
 
 int sock_setsockopt(struct socket *sock, int level, int optname,
-                   char __user *optval, unsigned int optlen)
+                   sockptr_t optval, unsigned int optlen)
 {
        struct sock_txtime sk_txtime;
        struct sock *sk = sock->sk;
@@ -840,12 +840,12 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
         */
 
        if (optname == SO_BINDTODEVICE)
-               return sock_setbindtodevice(sk, USER_SOCKPTR(optval), optlen);
+               return sock_setbindtodevice(sk, optval, optlen);
 
        if (optlen < sizeof(int))
                return -EINVAL;
 
-       if (get_user(val, (int __user *)optval))
+       if (copy_from_sockptr(&val, optval, sizeof(val)))
                return -EFAULT;
 
        valbool = val ? 1 : 0;
@@ -958,7 +958,7 @@ set_sndbuf:
                        ret = -EINVAL;  /* 1003.1g */
                        break;
                }
-               if (copy_from_user(&ling, optval, sizeof(ling))) {
+               if (copy_from_sockptr(&ling, optval, sizeof(ling))) {
                        ret = -EFAULT;
                        break;
                }
@@ -1052,21 +1052,20 @@ set_sndbuf:
 
        case SO_RCVTIMEO_OLD:
        case SO_RCVTIMEO_NEW:
-               ret = sock_set_timeout(&sk->sk_rcvtimeo, USER_SOCKPTR(optval),
+               ret = sock_set_timeout(&sk->sk_rcvtimeo, optval,
                                       optlen, optname == SO_RCVTIMEO_OLD);
                break;
 
        case SO_SNDTIMEO_OLD:
        case SO_SNDTIMEO_NEW:
-               ret = sock_set_timeout(&sk->sk_sndtimeo, USER_SOCKPTR(optval),
+               ret = sock_set_timeout(&sk->sk_sndtimeo, optval,
                                       optlen, optname == SO_SNDTIMEO_OLD);
                break;
 
        case SO_ATTACH_FILTER: {
                struct sock_fprog fprog;
 
-               ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval),
-                                              optlen);
+               ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
                if (!ret)
                        ret = sk_attach_filter(&fprog, sk);
                break;
@@ -1077,7 +1076,7 @@ set_sndbuf:
                        u32 ufd;
 
                        ret = -EFAULT;
-                       if (copy_from_user(&ufd, optval, sizeof(ufd)))
+                       if (copy_from_sockptr(&ufd, optval, sizeof(ufd)))
                                break;
 
                        ret = sk_attach_bpf(ufd, sk);
@@ -1087,8 +1086,7 @@ set_sndbuf:
        case SO_ATTACH_REUSEPORT_CBPF: {
                struct sock_fprog fprog;
 
-               ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval),
-                                              optlen);
+               ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
                if (!ret)
                        ret = sk_reuseport_attach_filter(&fprog, sk);
                break;
@@ -1099,7 +1097,7 @@ set_sndbuf:
                        u32 ufd;
 
                        ret = -EFAULT;
-                       if (copy_from_user(&ufd, optval, sizeof(ufd)))
+                       if (copy_from_sockptr(&ufd, optval, sizeof(ufd)))
                                break;
 
                        ret = sk_reuseport_attach_bpf(ufd, sk);
@@ -1179,7 +1177,7 @@ set_sndbuf:
 
                if (sizeof(ulval) != sizeof(val) &&
                    optlen >= sizeof(ulval) &&
-                   get_user(ulval, (unsigned long __user *)optval)) {
+                   copy_from_sockptr(&ulval, optval, sizeof(ulval))) {
                        ret = -EFAULT;
                        break;
                }
@@ -1222,7 +1220,7 @@ set_sndbuf:
                if (optlen != sizeof(struct sock_txtime)) {
                        ret = -EINVAL;
                        break;
-               } else if (copy_from_user(&sk_txtime, optval,
+               } else if (copy_from_sockptr(&sk_txtime, optval,
                           sizeof(struct sock_txtime))) {
                        ret = -EFAULT;
                        break;

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 979dfcd2aa141a59fa291edbda40fe2a0aa40dda..7246847efa907686fd206ce2b7c3f5be2fb6bfed 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1648,7 +1648,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
                        return -EINVAL;
                }
 
-               ret = sock_setsockopt(ssock, SOL_SOCKET, optname, optval, optlen);
+               ret = sock_setsockopt(ssock, SOL_SOCKET, optname,
+                                     USER_SOCKPTR(optval), optlen);
                if (ret == 0) {
                        if (optname == SO_REUSEPORT)
                                sk->sk_reuseport = ssock->sk->sk_reuseport;
@@ -1659,7 +1660,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
                return ret;
        }
 
-       return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen);
+       return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname,
+                              USER_SOCKPTR(optval), optlen);
 }
 
 static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,

diff --git a/net/socket.c b/net/socket.c
index 93846568c2fb7abecc5f0ba79e519f59c579de22..c97f83d879ae755b7c7b2bca5330b5782e634599 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2130,7 +2130,8 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *optval,
        }
 
        if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock))
-               err = sock_setsockopt(sock, level, optname, optval, optlen);
+               err = sock_setsockopt(sock, level, optname,
+                                     USER_SOCKPTR(optval), optlen);
        else if (unlikely(!sock->ops->setsockopt))
                err = -EOPNOTSUPP;
        else