AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-29 00:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix __ASSUME_SENDMMSG issues (bug 16611).

Browse Source 
Similar to the issues for accept4 and recvmmsg, __ASSUME_SENDMMSG is
also confused about whether it relates to function availability or
socketcall operation availability, and the conditions for the
definition are always wrong (sendmmsg appeared in Linux kernel 3.0,
not 2.6.39); this is now bug 16611.

This patch splits the macro into separate macros like those for
accept4 and recvmmsg, defining them for appropriate kernel versions.

Tested x86_64, including that disassembly of the installed shared
libraries is unchanged by this patch.

	[BZ #16611]
	* sysdeps/unix/sysv/linux/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030000 && __ASSUME_SOCKETCALL]
	(__ASSUME_SENDMMSG_SOCKETCALL): Define.
	[__LINUX_KERNEL_VERSION >= 0x030000 && (__i386__ || __x86_64__ ||
	__powerpc__ || __sh__ || __sparc__)] (__ASSUME_SENDMMSG_SYSCALL):
	Likewise.
	[__i386__ || __powerpc__ || __sh__ || __sparc__]
	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	[__ASSUME_SENDMMSG_SOCKETCALL || __ASSUME_SENDMMSG_SYSCALL]
	(__ASSUME_SENDMMSG): Define instead of using previous
	[__LINUX_KERNEL_VERSION >= 0x020627] condition.
	* sysdeps/unix/sysv/linux/aarch64/kernel-features.h
	(__ASSUME_SENDMMSG_SYSCALL): Define.
	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030200] (__ASSUME_SENDMMSG_SYSCALL):
	Likewise.
	* sysdeps/unix/sysv/linux/arm/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
	Likewise.
	* sysdeps/unix/sysv/linux/ia64/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
	Likewise.
	* sysdeps/unix/sysv/linux/internal_sendmmsg.S [__ASSUME_SOCKETCALL
	&& !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
	!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
	[__ASSUME_SENDMMSG]: Change conditionals to
	[__ASSUME_SENDMMSG_SOCKETCALL].
	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_SENDMMSG_SYSCALL):
	Define.
	* sysdeps/unix/sysv/linux/mips/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
	Likewise.
	* sysdeps/unix/sysv/linux/sendmmsg.c [__ASSUME_SOCKETCALL &&
	!__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
	!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
	[!__ASSUME_SENDMMSG]: Change conditional to
	[!__ASSUME_SENDMMSG_SOCKETCALL].
	* sysdeps/unix/sysv/linux/tile/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
	Define.

	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
	[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
	Define.
This commit is contained in:
Joseph Myers 2014-02-20 17:55:35 +00:00
parent 0e31b18ca2
commit bc688c1029
14 changed files with 124 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ChangeLog
View File

@ -1,5 +1,48 @@
2014-02-20 Joseph Myers <joseph@codesourcery.com> 2014-02-20 Joseph Myers <joseph@codesourcery.com>
[BZ #16611]
* sysdeps/unix/sysv/linux/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030000 && __ASSUME_SOCKETCALL]
(__ASSUME_SENDMMSG_SOCKETCALL): Define.
[__LINUX_KERNEL_VERSION >= 0x030000 && (__i386__ || __x86_64__ ||
__powerpc__ || __sh__ || __sparc__)] (__ASSUME_SENDMMSG_SYSCALL):
Likewise.
[__i386__ || __powerpc__ || __sh__ || __sparc__]
(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
[__ASSUME_SENDMMSG_SOCKETCALL || __ASSUME_SENDMMSG_SYSCALL]
(__ASSUME_SENDMMSG): Define instead of using previous
[__LINUX_KERNEL_VERSION >= 0x020627] condition.
* sysdeps/unix/sysv/linux/aarch64/kernel-features.h
(__ASSUME_SENDMMSG_SYSCALL): Define.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030200] (__ASSUME_SENDMMSG_SYSCALL):
Likewise.
* sysdeps/unix/sysv/linux/arm/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
Likewise.
* sysdeps/unix/sysv/linux/ia64/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
Likewise.
* sysdeps/unix/sysv/linux/internal_sendmmsg.S [__ASSUME_SOCKETCALL
&& !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
[__ASSUME_SENDMMSG]: Change conditionals to
[__ASSUME_SENDMMSG_SOCKETCALL].
* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_SENDMMSG_SYSCALL):
Define.
* sysdeps/unix/sysv/linux/mips/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
Likewise.
* sysdeps/unix/sysv/linux/sendmmsg.c [__ASSUME_SOCKETCALL &&
!__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
!__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
[!__ASSUME_SENDMMSG]: Change conditional to
[!__ASSUME_SENDMMSG_SOCKETCALL].
* sysdeps/unix/sysv/linux/tile/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
Define.
[BZ #16610] [BZ #16610]
* sysdeps/unix/sysv/linux/kernel-features.h * sysdeps/unix/sysv/linux/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x020621 && __ASSUME_SOCKETCALL] [__LINUX_KERNEL_VERSION >= 0x020621 && __ASSUME_SOCKETCALL]

2
NEWS
View File

@ -9,7 +9,7 @@ Version 2.20
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
15894, 16447, 16545, 16574, 16609, 16610. 15894, 16447, 16545, 16574, 16609, 16610, 16611.
* The am33 port, which had not worked for several years, has been removed * The am33 port, which had not worked for several years, has been removed
from ports. from ports.

5
ports/ChangeLog.hppa
View File

@ -1,5 +1,10 @@
2014-02-20 Joseph Myers <joseph@codesourcery.com> 2014-02-20 Joseph Myers <joseph@codesourcery.com>
[BZ #16611]
* sysdeps/unix/sysv/linux/hppa/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
Define.
[BZ #16610] [BZ #16610]
* sysdeps/unix/sysv/linux/hppa/kernel-features.h * sysdeps/unix/sysv/linux/hppa/kernel-features.h
[__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL): [__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL):

5
ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
View File

@ -36,4 +36,9 @@
# define __ASSUME_RECVMMSG_SYSCALL 1 # define __ASSUME_RECVMMSG_SYSCALL 1
#endif #endif
/* Support for the sendmmsg syscall was added in 3.1. */
#if __LINUX_KERNEL_VERSION >= 0x030100
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>

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

@ -31,6 +31,7 @@
#define __ASSUME_O_CLOEXEC 1 #define __ASSUME_O_CLOEXEC 1
#define __ASSUME_PIPE2 1 #define __ASSUME_PIPE2 1
#define __ASSUME_RECVMMSG_SYSCALL 1 #define __ASSUME_RECVMMSG_SYSCALL 1
#define __ASSUME_SENDMMSG_SYSCALL 1
#define __ASSUME_SIGNALFD4 1 #define __ASSUME_SIGNALFD4 1
#define __ASSUME_SOCK_CLOEXEC 1 #define __ASSUME_SOCK_CLOEXEC 1
#define __ASSUME_UTIMES 1 #define __ASSUME_UTIMES 1

3
sysdeps/unix/sysv/linux/alpha/kernel-features.h
View File

@ -47,9 +47,10 @@
# define __ASSUME_RECVMMSG_SYSCALL 1 # define __ASSUME_RECVMMSG_SYSCALL 1
#endif #endif
/* Support for accept4 was added for alpha in 3.2. */ /* Support for accept4 and sendmmsg was added for alpha in 3.2. */
#if __LINUX_KERNEL_VERSION >= 0x030200 #if __LINUX_KERNEL_VERSION >= 0x030200
# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_SYSCALL 1
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif #endif
#include_next <kernel-features.h> #include_next <kernel-features.h>

5
sysdeps/unix/sysv/linux/arm/kernel-features.h
View File

@ -41,6 +41,11 @@
# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_SYSCALL 1
#endif #endif
/* Support for the sendmmsg syscall was added in 3.0. */
#if __LINUX_KERNEL_VERSION >= 0x030000
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* Support for pselect6, ppoll and epoll_pwait was added in 2.6.32. */ /* Support for pselect6, ppoll and epoll_pwait was added in 2.6.32. */

5
sysdeps/unix/sysv/linux/ia64/kernel-features.h
View File

@ -52,6 +52,11 @@
# define __ASSUME_RECVMMSG_SYSCALL 1 # define __ASSUME_RECVMMSG_SYSCALL 1
#endif #endif
/* Support for the sendmmsg syscall was added in 3.0. */
#if __LINUX_KERNEL_VERSION >= 0x030000
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
/* Support for the accept4 syscall was added in 3.3. */ /* Support for the accept4 syscall was added in 3.3. */
#if __LINUX_KERNEL_VERSION >= 0x030300 #if __LINUX_KERNEL_VERSION >= 0x030300
# define __ASSUME_ACCEPT4_SYSCALL 1 # define __ASSUME_ACCEPT4_SYSCALL 1

14
sysdeps/unix/sysv/linux/internal_sendmmsg.S
View File

@ -1,15 +1,25 @@
#include <kernel-features.h> #include <kernel-features.h>
#include <sys/syscall.h> #include <sys/syscall.h>
/* Do not use the sendmmsg syscall on socketcall architectures unless
it was added at the same time as the socketcall support or can be
assumed to be present. */
#if defined __ASSUME_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL
# undef __NR_sendmmsg
#endif
#if !defined __NR_sendmmsg && defined __NR_socketcall #if !defined __NR_sendmmsg && defined __NR_socketcall
# define socket sendmmsg # define socket sendmmsg
# ifndef __ASSUME_SENDMMSG # ifndef __ASSUME_SENDMMSG_SOCKETCALL
# define __socket __internal_sendmmsg # define __socket __internal_sendmmsg
# define NO_WEAK_ALIAS # define NO_WEAK_ALIAS
# endif # endif
# define NARGS 4 # define NARGS 4
# define NEED_CANCELLATION # define NEED_CANCELLATION
# include <socket.S> # include <socket.S>
# ifdef __ASSUME_SENDMMSG # ifdef __ASSUME_SENDMMSG_SOCKETCALL
libc_hidden_def (__sendmmsg) libc_hidden_def (__sendmmsg)
# endif # endif
#endif #endif

21
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -271,8 +271,25 @@
# define __ASSUME_PRLIMIT64 1 # define __ASSUME_PRLIMIT64 1
#endif #endif
/* sendmmsg is available in 2.6.39. */ /* Support for sendmmsg functionality was added in 3.0. The macros
#if __LINUX_KERNEL_VERSION >= 0x020627 defined correspond to those for accept4 and recvmmsg. */
#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __ASSUME_SOCKETCALL
# define __ASSUME_SENDMMSG_SOCKETCALL 1
#endif
/* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
SPARC in 3.0. */
#if __LINUX_KERNEL_VERSION >= 0x030000 \
&& (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
|| defined __sh__ || defined __sparc__)
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#if defined __i386__ || defined __powerpc__ || defined __sh__ \
|| defined __sparc__
# define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
#endif
#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
# define __ASSUME_SENDMMSG 1 # define __ASSUME_SENDMMSG 1
#endif #endif

5
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View File

@ -36,4 +36,9 @@
#endif #endif
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
/* Support for the sendmmsg syscall was added in 3.3. */
#if __LINUX_KERNEL_VERSION >= 0x030300
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>

5
sysdeps/unix/sysv/linux/mips/kernel-features.h
View File

@ -41,6 +41,11 @@
# define __ASSUME_RECVMMSG_SYSCALL 1 # define __ASSUME_RECVMMSG_SYSCALL 1
#endif #endif
/* Support for the sendmmsg syscall was added in 3.1. */
#if __LINUX_KERNEL_VERSION >= 0x030100
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* The n32 syscall ABI did not have a getdents64 syscall until /* The n32 syscall ABI did not have a getdents64 syscall until

13
sysdeps/unix/sysv/linux/sendmmsg.c
View File

@ -23,6 +23,14 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <kernel-features.h> #include <kernel-features.h>
/* Do not use the sendmmsg syscall on socketcall architectures unless
it was added at the same time as the socketcall support or can be
assumed to be present. */
#if defined __ASSUME_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL
# undef __NR_sendmmsg
#endif
#ifdef __NR_sendmmsg #ifdef __NR_sendmmsg
int int
@ -42,7 +50,7 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
libc_hidden_def (__sendmmsg) libc_hidden_def (__sendmmsg)
weak_alias (__sendmmsg, sendmmsg) weak_alias (__sendmmsg, sendmmsg)
#elif defined __NR_socketcall #elif defined __NR_socketcall
# ifndef __ASSUME_SENDMMSG # ifndef __ASSUME_SENDMMSG_SOCKETCALL
extern int __internal_sendmmsg (int fd, struct mmsghdr *vmessages, extern int __internal_sendmmsg (int fd, struct mmsghdr *vmessages,
unsigned int vlen, int flags) unsigned int vlen, int flags)
attribute_hidden; attribute_hidden;
@ -86,7 +94,8 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
libc_hidden_def (__sendmmsg) libc_hidden_def (__sendmmsg)
weak_alias (__sendmmsg, sendmmsg) weak_alias (__sendmmsg, sendmmsg)
# else # else
/* When __ASSUME_SENDMMSG sendmmsg is defined in internal_sendmmsg.S. */ /* When __ASSUME_SENDMMSG_SOCKETCALL sendmmsg is defined in
internal_sendmmsg.S. */
# endif # endif
#else #else
# include <socket/sendmmsg.c> # include <socket/sendmmsg.c>

5
sysdeps/unix/sysv/linux/tile/kernel-features.h
View File

@ -29,6 +29,11 @@
#define __ASSUME_DUP3 1 #define __ASSUME_DUP3 1
#define __ASSUME_RECVMMSG_SYSCALL 1 #define __ASSUME_RECVMMSG_SYSCALL 1
/* Support for the sendmmsg syscall was added in 3.0. */
#if __LINUX_KERNEL_VERSION >= 0x030000
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* Define this if your 32-bit syscall API requires 64-bit register /* Define this if your 32-bit syscall API requires 64-bit register