net: socket: add __compat_sys_setsockopt() helper; remove in-kernel call to compat...

Using the net-internal helper __compat_sys_setsockopt() allows us to avoid
the internal calls to the compat_sys_setsockopt() syscall.

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net

Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/net/compat.c b/net/compat.c
index 513adc8d0e0fdad90d580183e25b940f58f93daa..75bfcbbb2e3ea0c2d75f8660badada0900766763 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -383,8 +383,8 @@ static int compat_sock_setsockopt(struct socket *sock, int level, int optname,
        return sock_setsockopt(sock, level, optname, optval, optlen);
 }
 
-COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
-                      char __user *, optval, unsigned int, optlen)
+static int __compat_sys_setsockopt(int fd, int level, int optname,
+                                  char __user *optval, unsigned int optlen)
 {
        int err;
        struct socket *sock = sockfd_lookup(fd, &err);
@@ -410,6 +410,12 @@ COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
        return err;
 }
 
+COMPAT_SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
+                      char __user *, optval, unsigned int, optlen)
+{
+       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)
 {
@@ -864,8 +870,8 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
                ret = __sys_shutdown(a0, a1);
                break;
        case SYS_SETSOCKOPT:
-               ret = compat_sys_setsockopt(a0, a1, a[2],
-                               compat_ptr(a[3]), a[4]);
+               ret = __compat_sys_setsockopt(a0, a1, a[2],
+                                             compat_ptr(a[3]), a[4]);
                break;
        case SYS_GETSOCKOPT:
                ret = compat_sys_getsockopt(a0, a1, a[2],