mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-03 21:01:50 +00:00
net: socket: add __sys_accept4() helper; remove in-kernel call to syscall
Using the net-internal helper __sys_accept4() allows us to avoid the internal calls to the sys_accept4() 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:
parent
211b634b7f
commit
4541e80560
3 changed files with 17 additions and 9 deletions
20
net/socket.c
20
net/socket.c
|
@ -1519,8 +1519,8 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
|
|||
* clean when we restucture accept also.
|
||||
*/
|
||||
|
||||
SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
|
||||
int __user *, upeer_addrlen, int, flags)
|
||||
int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
|
||||
int __user *upeer_addrlen, int flags)
|
||||
{
|
||||
struct socket *sock, *newsock;
|
||||
struct file *newfile;
|
||||
|
@ -1599,10 +1599,16 @@ out_fd:
|
|||
goto out_put;
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
|
||||
int __user *, upeer_addrlen, int, flags)
|
||||
{
|
||||
return __sys_accept4(fd, upeer_sockaddr, upeer_addrlen, flags);
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE3(accept, int, fd, struct sockaddr __user *, upeer_sockaddr,
|
||||
int __user *, upeer_addrlen)
|
||||
{
|
||||
return sys_accept4(fd, upeer_sockaddr, upeer_addrlen, 0);
|
||||
return __sys_accept4(fd, upeer_sockaddr, upeer_addrlen, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -2469,8 +2475,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
|
|||
err = sys_listen(a0, a1);
|
||||
break;
|
||||
case SYS_ACCEPT:
|
||||
err = sys_accept4(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2], 0);
|
||||
err = __sys_accept4(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2], 0);
|
||||
break;
|
||||
case SYS_GETSOCKNAME:
|
||||
err =
|
||||
|
@ -2525,8 +2531,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
|
|||
(struct timespec __user *)a[4]);
|
||||
break;
|
||||
case SYS_ACCEPT4:
|
||||
err = sys_accept4(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2], a[3]);
|
||||
err = __sys_accept4(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2], a[3]);
|
||||
break;
|
||||
default:
|
||||
err = -EINVAL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue