diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-03-13 19:52:00 +0100 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-04-02 20:15:16 +0200 |
commit | f3bf896b1d041153ea1c6cfa58f6f4658c91089f (patch) | |
tree | 77445b3d5d98a6bc4ba26a83dac7e1bbcb225683 | |
parent | e1834a329d6bb5659c14e9e537bd1f750fe3b85e (diff) | |
download | linux-stable-f3bf896b1d041153ea1c6cfa58f6f4658c91089f.tar.gz linux-stable-f3bf896b1d041153ea1c6cfa58f6f4658c91089f.tar.bz2 linux-stable-f3bf896b1d041153ea1c6cfa58f6f4658c91089f.zip |
net: socket: replace calls to sys_send() with __sys_sendto()
sys_send() merely expands the parameters to __sys_sendto() by NULL and 0.
Open-code this in the two places which used sys_send() as a wrapper to
__sys_sendto().
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>
-rw-r--r-- | net/compat.c | 2 | ||||
-rw-r--r-- | net/socket.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c index 5caa48987bb2..d55982ff5c59 100644 --- a/net/compat.c +++ b/net/compat.c @@ -837,7 +837,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args) ret = __sys_socketpair(a0, a1, a[2], compat_ptr(a[3])); break; case SYS_SEND: - ret = sys_send(a0, compat_ptr(a1), a[2], a[3]); + ret = __sys_sendto(a0, compat_ptr(a1), a[2], a[3], NULL, 0); break; case SYS_SENDTO: ret = __sys_sendto(a0, compat_ptr(a1), a[2], a[3], diff --git a/net/socket.c b/net/socket.c index a70793a7ce78..92de21bb1a2e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2558,7 +2558,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) err = __sys_socketpair(a0, a1, a[2], (int __user *)a[3]); break; case SYS_SEND: - err = sys_send(a0, (void __user *)a1, a[2], a[3]); + err = __sys_sendto(a0, (void __user *)a1, a[2], a[3], + NULL, 0); break; case SYS_SENDTO: err = __sys_sendto(a0, (void __user *)a1, a[2], a[3], |