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_getpeername() helper; remove in-kernel call to syscall 

Using the net-internal helper __sys_getpeername() allows us to avoid the
internal calls to the sys_getpeername() 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:47:00 +01:00
parent 8882a107b3
commit b21c8f838a
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

@ -370,5 +370,7 @@ extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,
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, extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,
int __user *usockaddr_len); int __user *usockaddr_len);
extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,
int __user *usockaddr_len);
#endif /* _LINUX_SOCKET_H */ #endif /* _LINUX_SOCKET_H */

2
net/compat.c
View File

@ -829,7 +829,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
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]));
break; break;
case SYS_SOCKETPAIR: case SYS_SOCKETPAIR:
ret = sys_socketpair(a0, a1, a[2], compat_ptr(a[3])); ret = sys_socketpair(a0, a1, a[2], compat_ptr(a[3]));

14
net/socket.c
View File

@ -1712,8 +1712,8 @@ SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr,
* name to user space. * name to user space.
*/ */
SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, int __sys_getpeername(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;
@ -1738,6 +1738,12 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
return err; return err;
} }
SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
int __user *, usockaddr_len)
{
return __sys_getpeername(fd, usockaddr, usockaddr_len);
}
/* /*
* Send a datagram to a given address. We move the address into kernel * Send a datagram to a given address. We move the address into kernel
* space and check the user space data area is readable before invoking * space and check the user space data area is readable before invoking
@ -2511,8 +2517,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
break; break;
case SYS_GETPEERNAME: case SYS_GETPEERNAME:
err = err =
sys_getpeername(a0, (struct sockaddr __user *)a1, __sys_getpeername(a0, (struct sockaddr __user *)a1,
(int __user *)a[2]); (int __user *)a[2]);
break; break;
case SYS_SOCKETPAIR: case SYS_SOCKETPAIR:
err = sys_socketpair(a0, a1, a[2], (int __user *)a[3]); err = sys_socketpair(a0, a1, a[2], (int __user *)a[3]);