UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Using the net-internal helper __sys_getsockname() allows us to avoid the
internal calls to the sys_getsockname() 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 19:43:14 +01:00
parent 25e290eed9
commit 8882a107b3
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/socket.h
View File

@ -368,5 +368,7 @@ extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);
extern int __sys_connect(int fd, struct sockaddr __user *uservaddr, extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,
int addrlen); int addrlen);
extern int __sys_listen(int fd, int backlog); extern int __sys_listen(int fd, int backlog);
extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,
int __user *usockaddr_len);
#endif /* _LINUX_SOCKET_H */ #endif /* _LINUX_SOCKET_H */

2
net/compat.c
View File

@ -826,7 +826,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0); ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0);
break; break;
case SYS_GETSOCKNAME: case SYS_GETSOCKNAME:
ret = sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2])); ret = __sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2]));
break; break;
case SYS_GETPEERNAME: case SYS_GETPEERNAME:
ret = sys_getpeername(a0, compat_ptr(a1), compat_ptr(a[2])); ret = sys_getpeername(a0, compat_ptr(a1), compat_ptr(a[2]));

14
net/socket.c
View File

@ -1675,8 +1675,8 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
* name to user space. * name to user space.
*/ */
SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr, int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,
int __user *, usockaddr_len) int __user *usockaddr_len)
{ {
struct socket *sock; struct socket *sock;
struct sockaddr_storage address; struct sockaddr_storage address;
@ -1701,6 +1701,12 @@ out:
return err; return err;
} }
SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr,
int __user *, usockaddr_len)
{
return __sys_getsockname(fd, usockaddr, usockaddr_len);
}
/* /*
* Get the remote address ('name') of a socket object. Move the obtained * Get the remote address ('name') of a socket object. Move the obtained
* name to user space. * name to user space.
@ -2500,8 +2506,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
break; break;
case SYS_GETSOCKNAME: case SYS_GETSOCKNAME:
err = err =
sys_getsockname(a0, (struct sockaddr __user *)a1, __sys_getsockname(a0, (struct sockaddr __user *)a1,
(int __user *)a[2]); (int __user *)a[2]);
break; break;
case SYS_GETPEERNAME: case SYS_GETPEERNAME:
err = err =