net: socket: add __sys_getsockopt() helper; remove in-kernel call to syscall

Using the net-internal helper __sys_getsockopt() allows us to avoid the
internal calls to the sys_getsockopt() 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>
This commit is contained in:
Dominik Brodowski 2018-03-13 20:15:04 +01:00
parent cc36dca0df
commit 13a2d70e2b
1 changed files with 10 additions and 4 deletions

View File

@ -1918,8 +1918,8 @@ SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
* to pass a user mode parameter for the protocols to sort out. * to pass a user mode parameter for the protocols to sort out.
*/ */
SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname, static int __sys_getsockopt(int fd, int level, int optname,
char __user *, optval, int __user *, optlen) char __user *optval, int __user *optlen)
{ {
int err, fput_needed; int err, fput_needed;
struct socket *sock; struct socket *sock;
@ -1944,6 +1944,12 @@ out_put:
return err; return err;
} }
SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname,
char __user *, optval, int __user *, optlen)
{
return __sys_getsockopt(fd, level, optname, optval, optlen);
}
/* /*
* Shutdown a socket. * Shutdown a socket.
*/ */
@ -2563,8 +2569,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
break; break;
case SYS_GETSOCKOPT: case SYS_GETSOCKOPT:
err = err =
sys_getsockopt(a0, a1, a[2], (char __user *)a[3], __sys_getsockopt(a0, a1, a[2], (char __user *)a[3],
(int __user *)a[4]); (int __user *)a[4]);
break; break;
case SYS_SENDMSG: case SYS_SENDMSG:
err = sys_sendmsg(a0, (struct user_msghdr __user *)a1, a[2]); err = sys_sendmsg(a0, (struct user_msghdr __user *)a1, a[2]);