Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d6a15c3 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

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

Using the net-internal helper __sys_socket() allows us to avoid the
internal calls to the sys_socket() 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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 4541e805

include/linux/socket.h

+1 −0
Original line number Diff line number Diff line
@@ -363,5 +363,6 @@ extern int __sys_sendto(int fd, void __user *buff, size_t len, 
			int addr_len);

extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,

			 int __user *upeer_addrlen, int flags);

extern int __sys_socket(int family, int type, int protocol);



#endif /* _LINUX_SOCKET_H */

net/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args) 


	switch (call) {

	case SYS_SOCKET:

		ret = sys_socket(a0, a1, a[2]);

		ret = __sys_socket(a0, a1, a[2]);

		break;

	case SYS_BIND:

		ret = sys_bind(a0, compat_ptr(a1), a[2]);

net/socket.c

+7 −2
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ int sock_create_kern(struct net *net, int family, int type, int protocol, struct 
}

EXPORT_SYMBOL(sock_create_kern);



SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)

int __sys_socket(int family, int type, int protocol)

{

	int retval;

	struct socket *sock;
@@ -1359,6 +1359,11 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) 
	return sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));

}



SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)

{

	return __sys_socket(family, type, protocol);

}



/*

 *	Create a pair of connected sockets.

 */
@@ -2463,7 +2468,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) 


	switch (call) {

	case SYS_SOCKET:

		err = sys_socket(a0, a1, a[2]);

		err = __sys_socket(a0, a1, a[2]);

		break;

	case SYS_BIND:

		err = sys_bind(a0, (struct sockaddr __user *)a1, a[2]);