iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: socket: replace call to sys_recv() with __sys_recvfrom()

Browse Source 
sys_recv() merely expands the parameters to __sys_recvfrom() by NULL and
NULL. Open-code this in the two places which used sys_recv() as a wrapper
to __sys_recvfrom().

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 19:54:17 +01:00
parent f3bf896b1d
commit d27e9afc64
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/compat.c
View File

@ -755,7 +755,8 @@ COMPAT_SYSCALL_DEFINE3(recvmsg, int, fd, struct compat_msghdr __user *, msg, uns
COMPAT_SYSCALL_DEFINE4(recv, int, fd, void __user *, buf, compat_size_t, len, unsigned int, flags) COMPAT_SYSCALL_DEFINE4(recv, int, fd, void __user *, buf, compat_size_t, len, unsigned int, flags)
{ {
return sys_recv(fd, buf, len, flags | MSG_CMSG_COMPAT); return __sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, NULL,
NULL);
} }
COMPAT_SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, buf, compat_size_t, len, COMPAT_SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, buf, compat_size_t, len,

3
net/socket.c
View File

@ -2566,7 +2566,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
(struct sockaddr __user *)a[4], a[5]); (struct sockaddr __user *)a[4], a[5]);
break; break;
case SYS_RECV: case SYS_RECV:
err = sys_recv(a0, (void __user *)a1, a[2], a[3]); err = __sys_recvfrom(a0, (void __user *)a1, a[2], a[3],
NULL, NULL);
break; break;
case SYS_RECVFROM: case SYS_RECVFROM:
err = __sys_recvfrom(a0, (void __user *)a1, a[2], a[3], err = __sys_recvfrom(a0, (void __user *)a1, a[2], a[3],