niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Linux: Assume and consolidate getsockname wire-up syscall

Browse source 
And disable if kernel does not support it.

Checked on x86_64-linux-gnu and i686-linux-gnu.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2022-10-18 16:28:44 -03:00
parent 6008978f06
commit a7bf5f4e69
10 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysdeps/unix/sysv/linux/generic/syscalls.list
View file

@ -1,5 +1,4 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
# Socket APIs # Socket APIs
getsockname - getsockname i:ipp __getsockname getsockname
getpeername - getpeername i:ipp __getpeername getpeername getpeername - getpeername i:ipp __getpeername getpeername

7
sysdeps/unix/sysv/linux/getsockname.c
View file

@ -15,19 +15,14 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <socketcall.h> #include <socketcall.h>
#include <kernel-features.h>
#include <sys/syscall.h>
int int
__getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len) __getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len)
{ {
#ifdef __ASSUME_GETSOCKNAME_SYSCALL #ifdef __ASSUME_GETSOCKNAME_SYSCALL
return INLINE_SYSCALL (getsockname, 3, fd, addr.__sockaddr__, len); return INLINE_SYSCALL_CALL (getsockname, fd, addr.__sockaddr__, len);
#else #else
return SOCKETCALL (getsockname, fd, addr.__sockaddr__, len); return SOCKETCALL (getsockname, fd, addr.__sockaddr__, len);
#endif #endif

2
sysdeps/unix/sysv/linux/i386/kernel-features.h
View file

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
#endif #endif
@ -42,6 +41,7 @@
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_LISTEN_SYSCALL
# undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL
# undef __ASSUME_GETSOCKNAME_SYSCALL
#endif #endif
/* i686 only supports ipc syscall before 5.1. */ /* i686 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/kernel-features.h
View file

@ -84,6 +84,7 @@
#define __ASSUME_SOCKETPAIR_SYSCALL 1 #define __ASSUME_SOCKETPAIR_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1 #define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1 #define __ASSUME_SHUTDOWN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
/* Support for SysV IPC through wired syscalls. All supported architectures /* Support for SysV IPC through wired syscalls. All supported architectures
either support ipc syscall and/or all the ipc correspondent syscalls. */ either support ipc syscall and/or all the ipc correspondent syscalls. */

2
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View file

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
#endif #endif
@ -44,6 +43,7 @@
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_LISTEN_SYSCALL
# undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL
# undef __ASSUME_GETSOCKNAME_SYSCALL
#endif #endif
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */ /* No support for PI futexes or robust mutexes before 3.10 for m68k. */

1
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View file

@ -19,7 +19,6 @@
/* All supported kernel versions for MicroBlaze have these syscalls. */ /* All supported kernel versions for MicroBlaze have these syscalls. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1

1
sysdeps/unix/sysv/linux/powerpc/kernel-features.h
View file

@ -19,7 +19,6 @@
/* New syscalls added for PowerPC in 2.6.37. */ /* New syscalls added for PowerPC in 2.6.37. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1

2
sysdeps/unix/sysv/linux/s390/kernel-features.h
View file

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
#endif #endif
@ -44,6 +43,7 @@
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_LISTEN_SYSCALL
# undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL
# undef __ASSUME_GETSOCKNAME_SYSCALL
#endif #endif
/* s390 only supports ipc syscall before 5.1. */ /* s390 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/sh/kernel-features.h
View file

@ -24,7 +24,6 @@
/* These syscalls were added for SH in 2.6.37. */ /* These syscalls were added for SH in 2.6.37. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1

6
sysdeps/unix/sysv/linux/sparc/kernel-features.h
View file

@ -42,6 +42,12 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL # undef __ASSUME_SETSOCKOPT_SYSCALL
#endif #endif
/* There syscalls were added for 32-bit in compat syscall table only
in 4.20 (but present for 64-bit in all supported kernel versions). */
#if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400
# undef __ASSUME_GETSOCKNAME_SYSCALL
#endif
/* These syscalls were added for both 32-bit and 64-bit in 4.4. */ /* These syscalls were added for both 32-bit and 64-bit in 4.4. */
#if __LINUX_KERNEL_VERSION < 0x040400 #if __LINUX_KERNEL_VERSION < 0x040400
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL