socket: move compat timeout handling into sock.c

This is a cleanup to prepare for the addition of 64-bit time_t
in O_SNDTIMEO/O_RCVTIMEO. The existing compat handler seems
unnecessarily complex and error-prone, moving it all into the
main setsockopt()/getsockopt() implementation requires half
as much code and is easier to extend.

32-bit user space can now use old_timeval32 on both 32-bit
and 64-bit machines, while 64-bit code can use
__old_kernel_timeval.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 65 deletions

diff --git a/net/compat.c b/net/compat.c
index 959d1c51826d..ce8f6e8cdcd2 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -348,28 +348,6 @@ static int do_set_attach_filter(struct socket *sock, int level, int optname,
                               sizeof(struct sock_fprog));
 }
 
-static int do_set_sock_timeout(struct socket *sock, int level,
-                int optname, char __user *optval, unsigned int optlen)
-{
-        struct compat_timeval __user *up = (struct compat_timeval __user *)optval;
-        struct timeval ktime;
-        mm_segment_t old_fs;
-        int err;
-
-        if (optlen < sizeof(*up))
-                return -EINVAL;
-        if (!access_ok(up, sizeof(*up)) ||
-            __get_user(ktime.tv_sec, &up->tv_sec) ||
-            __get_user(ktime.tv_usec, &up->tv_usec))
-                return -EFAULT;
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
-        set_fs(old_fs);
-
-        return err;
-}
-
 static int compat_sock_setsockopt(struct socket *sock, int level, int optname,
                                 char __user *optval, unsigned int optlen)
 {
@@ -377,10 +355,6 @@ static int compat_sock_setsockopt(struct socket *sock, int level, int optname,
             optname == SO_ATTACH_REUSEPORT_CBPF)
                 return do_set_attach_filter(sock, level, optname,
                                             optval, optlen);
-        if (!COMPAT_USE_64BIT_TIME &&
-            (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))
-                return do_set_sock_timeout(sock, level, optname, optval, optlen);
-
         return sock_setsockopt(sock, level, optname, optval, optlen);
 }
 
@@ -417,44 +391,6 @@ COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
         return __compat_sys_setsockopt(fd, level, optname, optval, optlen);
 }
 
-static int do_get_sock_timeout(struct socket *sock, int level, int optname,
-                char __user *optval, int __user *optlen)
-{
-        struct compat_timeval __user *up;
-        struct timeval ktime;
-        mm_segment_t old_fs;
-        int len, err;
-
-        up = (struct compat_timeval __user *) optval;
-        if (get_user(len, optlen))
-                return -EFAULT;
-        if (len < sizeof(*up))
-                return -EINVAL;
-        len = sizeof(ktime);
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
-        set_fs(old_fs);
-
-        if (!err) {
-                if (put_user(sizeof(*up), optlen) ||
-                    !access_ok(up, sizeof(*up)) ||
-                    __put_user(ktime.tv_sec, &up->tv_sec) ||
-                    __put_user(ktime.tv_usec, &up->tv_usec))
-                        err = -EFAULT;
-        }
-        return err;
-}
-
-static int compat_sock_getsockopt(struct socket *sock, int level, int optname,
-                                char __user *optval, int __user *optlen)
-{
-        if (!COMPAT_USE_64BIT_TIME &&
-            (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO))
-                return do_get_sock_timeout(sock, level, optname, optval, optlen);
-        return sock_getsockopt(sock, level, optname, optval, optlen);
-}
-
 int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
 {
         struct compat_timeval __user *ctv;
@@ -527,7 +463,7 @@ static int __compat_sys_getsockopt(int fd, int level, int optname,
                 }
 
                 if (level == SOL_SOCKET)
-                        err = compat_sock_getsockopt(sock, level,
+                        err = sock_getsockopt(sock, level,
                                         optname, optval, optlen);
                 else if (sock->ops->compat_getsockopt)
                         err = sock->ops->compat_getsockopt(sock, level,