mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	In <https://sourceware.org/ml/libc-alpha/2013-12/msg00008.html>, Aurelien noted issues with the definition of __ASSUME_ACCEPT4, which I discussed in more detail in <https://sourceware.org/ml/libc-alpha/2013-12/msg00014.html>; these are now bug 16609. As previously noted, __ASSUME_ACCEPT4 is used in two ways: * In OS-independent code, to mean "accept4 can be assumed to work rather than fail with ENOSYS". It doesn't matter whether it's implemented with socketcall or a separate syscall. * In Linux-specific code, to mean "the socketcall multiplex syscall can be assumed to handle the accept4 operation. When used in Linux-specific code, it *never* refers to anything relating to the accept4 syscall, only to the socketcall multiplexer. This patch splits the macro into separate __ASSUME_ACCEPT4_SOCKETCALL, __ASSUME_ACCEPT4_SYSCALL and __ASSUME_ACCEPT4 to clarify the different cases involved. A macro __ASSUME_SOCKETCALL is added for convenience in writing logic relating to all socketcall architectures. In addition, to address the issue of architectures where socketcall support for accept4 was added before a separate syscall was added (and so the separate syscall should not be used unless known to be present or fallback to socketcall is available), a fourth macro __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL is added to indicate that the syscall became available at the same time as socketcall support. This is then used in the relevant places in a conditional determining whether to undefine __NR_accept4 (the simple approach to avoiding the syscall's presence causing problems; I didn't try to implement runtime fallback from the syscall to socketcall). Architecture-specific note: alpha defined __ASSUME_ACCEPT4 for 2.6.33 and later, but actually the syscall was added for alpha in 3.2, so this patch uses the correct condition for __ASSUME_ACCEPT4_SYSCALL there. Tested x86_64, including that disassembly of the installed shared libraries is unchanged by this patch. [BZ #16609] * sysdeps/unix/sysv/linux/kernel-features.h [__i386__ || __powerpc__ || __s390__ || __sh__ || __sparc__] (__ASSUME_SOCKETCALL): Define. [__LINUX_KERNEL_VERSION && __ASSUME_SOCKETCALL] (__ASSUME_ACCEPT4_SOCKETCALL): Likewise. [(__LINUX_KERNEL_VERSION >= 0x02061c && (__x86_64__ || __sparc__)) || (__LINUX_KERNEL_VERSION >= 0x020625 && (__powerpc__ || __sh__))] (__ASSUME_ACCEPT4_SYSCALL): Likewise. [__sparc__] (__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise. [__ASSUME_ACCEPT4_SOCKETCALL || __ASSUME_ACCEPT4_SYSCALL] (__ASSUME_ACCEPT4): Define instead of using previous [__LINUX_KERNEL_VERSION >= 0x02061c && (__i386__ || __x86_64__ || __powerpc__ || __sparc__ || __s390__)] condition. * sysdeps/unix/sysv/linux/aarch64/kernel-features.h (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. * sysdeps/unix/sysv/linux/accept4.c [__ASSUME_SOCKETCALL && !__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL && !__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine. [!__ASSUME_ACCEPT4]: Change condition to [!__ASSUME_ACCEPT4_SOCKETCALL]. * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. Correct condition to [__LINUX_KERNEL_VERSION >= 0x030200]. * sysdeps/unix/sysv/linux/arm/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x020624] (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. * sysdeps/unix/sysv/linux/i386/accept4.S [__ASSUME_ACCEPT4]: Change conditions to [__ASSUME_ACCEPT4_SOCKETCALL]. * sysdeps/unix/sysv/linux/ia64/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. * sysdeps/unix/sysv/linux/internal_accept4.S [__ASSUME_SOCKETCALL && !__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL && !__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine. [__ASSUME_ACCEPT4]: Change condition to [__ASSUME_ACCEPT4_SOCKETCALL]. * sysdeps/unix/sysv/linux/m68k/kernel-features.h (__ASSUME_SOCKETCALL): Define. [__LINUX_KERNEL_VERSION >= 0x02061c] (__ASSUME_ACCEPT4): Remove. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_SOCKETCALL): Define. (__ASSUME_ACCEPT4): Remove. [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_ACCEPT4_SYSCALL): Define. * sysdeps/unix/sysv/linux/mips/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x02061f] (__ASSUME_ACCEPT4_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/tile/kernel-features.h (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. * sysdeps/unix/sysv/linux/hppa/kernel-features.h [__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_ACCEPT4_SYSCALL): Define.
		
			
				
	
	
		
			178 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
			
		
		
	
	
			178 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
| /* Copyright (C) 1995-2014 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
| 
 | |
|    The GNU C Library is free software; you can redistribute it and/or
 | |
|    modify it under the terms of the GNU Lesser General Public
 | |
|    License as published by the Free Software Foundation; either
 | |
|    version 2.1 of the License, or (at your option) any later version.
 | |
| 
 | |
|    The GNU C Library is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|    Lesser General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU Lesser General Public
 | |
|    License along with the GNU C Library; if not, see
 | |
|    <http://www.gnu.org/licenses/>.  */
 | |
| 
 | |
| #include <sysdep-cancel.h>
 | |
| #include <socketcall.h>
 | |
| #include <tls.h>
 | |
| #include <kernel-features.h>
 | |
| 
 | |
| #define EINVAL	22
 | |
| #define ENOSYS	38
 | |
| 
 | |
| #ifdef __ASSUME_ACCEPT4_SOCKETCALL
 | |
| # define errlabel SYSCALL_ERROR_LABEL
 | |
| #else
 | |
| # define errlabel .Lerr
 | |
| 	.data
 | |
| have_accept4:
 | |
| 	.long	0
 | |
| #endif
 | |
| 
 | |
| 	.text
 | |
| /* The socket-oriented system calls are handled unusally in Linux/i386.
 | |
|    They are all gated through the single `socketcall' system call number.
 | |
|    `socketcall' takes two arguments: the first is the subcode, specifying
 | |
|    which socket function is being called; and the second is a pointer to
 | |
|    the arguments to the specific function.  */
 | |
| 
 | |
| .globl __libc_accept4
 | |
| ENTRY (__libc_accept4)
 | |
| #ifdef CENABLE
 | |
| 	SINGLE_THREAD_P
 | |
| 	jne 1f
 | |
| #endif
 | |
| 
 | |
| 	/* Save registers.  */
 | |
| 	movl %ebx, %edx
 | |
| 	cfi_register (3, 2)
 | |
| 
 | |
| 	movl $SYS_ify(socketcall), %eax	/* System call number in %eax.  */
 | |
| 
 | |
| 	movl $SOCKOP_accept4, %ebx	/* Subcode is first arg to syscall.  */
 | |
| 	lea 4(%esp), %ecx		/* Address of args is 2nd arg.  */
 | |
| 
 | |
|         /* Do the system call trap.  */
 | |
| 	ENTER_KERNEL
 | |
| 
 | |
| 	/* Restore registers.  */
 | |
| 	movl %edx, %ebx
 | |
| 	cfi_restore (3)
 | |
| 
 | |
| 	/* %eax is < 0 if there was an error.  */
 | |
| 	cmpl $-125, %eax
 | |
| 	jae errlabel
 | |
| 
 | |
| 	/* Successful; return the syscall's value.  */
 | |
| 	ret
 | |
| 
 | |
| 
 | |
| #ifdef CENABLE
 | |
| 	/* We need one more register.  */
 | |
| 1:	pushl %esi
 | |
| 	cfi_adjust_cfa_offset(4)
 | |
| 
 | |
| 	/* Enable asynchronous cancellation.  */
 | |
| 	CENABLE
 | |
| 	movl %eax, %esi
 | |
| 	cfi_offset(6, -8)		/* %esi */
 | |
| 
 | |
| 	/* Save registers.  */
 | |
| 	movl %ebx, %edx
 | |
| 	cfi_register (3, 2)
 | |
| 
 | |
| 	movl $SYS_ify(socketcall), %eax	/* System call number in %eax.  */
 | |
| 
 | |
| 	movl $SOCKOP_accept4, %ebx	/* Subcode is first arg to syscall.  */
 | |
| 	lea 8(%esp), %ecx		/* Address of args is 2nd arg.  */
 | |
| 
 | |
|         /* Do the system call trap.  */
 | |
| 	ENTER_KERNEL
 | |
| 
 | |
| 	/* Restore registers.  */
 | |
| 	movl %edx, %ebx
 | |
| 	cfi_restore (3)
 | |
| 
 | |
| 	/* Restore the cancellation.  */
 | |
| 	xchgl %esi, %eax
 | |
| 	CDISABLE
 | |
| 
 | |
| 	/* Restore registers.  */
 | |
| 	movl %esi, %eax
 | |
| 	popl %esi
 | |
| 	cfi_restore (6)
 | |
| 	cfi_adjust_cfa_offset(-4)
 | |
| 
 | |
| 	/* %eax is < 0 if there was an error.  */
 | |
| 	cmpl $-125, %eax
 | |
| 	jae errlabel
 | |
| 
 | |
| 	/* Successful; return the syscall's value.  */
 | |
| 	ret
 | |
| #endif
 | |
| 
 | |
| #ifndef __ASSUME_ACCEPT4_SOCKETCALL
 | |
| 	/* The kernel returns -EINVAL for unknown socket operations.
 | |
| 	   We need to convert that error to an ENOSYS error.  */
 | |
| .Lerr:	cmpl $-EINVAL, %eax
 | |
| 	jne SYSCALL_ERROR_LABEL
 | |
| 
 | |
| 	/* Save registers.  */
 | |
| 	pushl %ebx
 | |
| 	cfi_adjust_cfa_offset(4)
 | |
| 	cfi_offset(ebx, -8)
 | |
| 
 | |
| # ifdef PIC
 | |
| 	SETUP_PIC_REG (dx)
 | |
| 	addl $_GLOBAL_OFFSET_TABLE_, %edx
 | |
| 	movl have_accept4@GOTOFF(%edx), %eax
 | |
| # else
 | |
| 	movl have_accept4, %eax
 | |
| # endif
 | |
| 	testl %eax, %eax
 | |
| 	jne 1f
 | |
| 
 | |
| 	/* Try another call, this time with the FLAGS parameter
 | |
| 	   cleared and an invalid file descriptor.  This call will not
 | |
| 	   cause any harm and it will return immediately.  */
 | |
| 	movl $-1, 8(%esp)
 | |
| 	movl $0, 20(%esp)
 | |
| 
 | |
| 	movl $SYS_ify(socketcall), %eax	/* System call number in %eax.  */
 | |
| 
 | |
| 	movl $SOCKOP_accept4, %ebx	/* Subcode is first arg to syscall.  */
 | |
| 	lea 8(%esp), %ecx		/* Address of args is 2nd arg.  */
 | |
| 
 | |
|         /* Do the system call trap.  */
 | |
| 	ENTER_KERNEL
 | |
| 
 | |
| 	cmpl $-EINVAL, %eax
 | |
| 	movl $-1, %eax
 | |
| 	je 3f
 | |
| 	movl $1, %eax
 | |
| 3:
 | |
| # ifdef PIC
 | |
| 	movl %eax, have_accept4@GOTOFF(%edx)
 | |
| # else
 | |
| 	movl %eax, have_accept4
 | |
| # endif
 | |
| 
 | |
| 	testl %eax, %eax
 | |
| 
 | |
| 1:	movl $-EINVAL, %eax
 | |
| 	jns 2f
 | |
| 	movl $-ENOSYS, %eax
 | |
| 
 | |
| 	/* Restore registers.  */
 | |
| 2:	popl %ebx
 | |
| 	cfi_restore (ebx)
 | |
| 
 | |
| 	jmp SYSCALL_ERROR_LABEL
 | |
| #endif
 | |
| PSEUDO_END (__libc_accept4)
 | |
| 
 | |
| weak_alias (__libc_accept4, accept4)
 |