OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network: recvmmsg and sendmmsg standard compliance (BZ#16919)

Browse Source 
POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen
to be of size int and socklen_t respectively, however Linux implements
it as a size_t.  So for 64-bits architecture where sizeof of size_t is
larger than socklen_t, both sendmmsg and recvmmsg need to adjust the
mmsghdr::msg_hdr internal fields before issuing the syscall itself.

This patch fixes it by operating on the padding if it the case.
For recvmmsg, the most straightfoward case, only zero padding the fields
is suffice.  However, for sendmmsg, where adjusting the buffer is out
of the contract (since it may point to a read-only data), the function
is rewritten to use sendmsg instead (which from previous patch
allocates a temporary msghdr to operate on).

Also for 64-bit ports that requires it, a new recvmmsg and sendmmsg
compat version is created (which uses size_t for both cmsghdr::cmsg_len
and internal

Tested on x86_64, i686, aarch64, armhf, and powerpc64le.

	* sysdeps/unix/sysv/linux/Makefile
	[$(subdir) = socket] (sysdep_routines): Add oldrecvmmsg and
	oldsendmmsg.
	* sysdeps/unix/sysv/linux/aarch64/libc.abilist: Add recvmmsg and
	sendmmsg.
	* sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise.
	* sysdeps/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist:
	Likewise.
	* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise.
	* sysdeps/unix/sysv/linux/oldrecvmmsg.c: New file.
	* sysdeps/unix/sysv/linux/oldsendmmsg.c: Likewise.
	* sysdeps/unix/sysv/linux/recvmmsg.c (__recvmmsg): Adjust msghdr
	iovlen and controllen fields to adjust to POSIX specification.
	* sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Likewise.
This commit is contained in:
Adhemerval Zanella 2016-03-17 09:52:17 -03:00
parent af7f7c7ec8
commit 222c2d7f43
16 changed files with 302 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,5 +1,26 @@
2016-05-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/Makefile
[$(subdir) = socket] (sysdep_routines): Add oldrecvmmsg and
oldsendmmsg.
* sysdeps/unix/sysv/linux/aarch64/libc.abilist: Add recvmmsg and
sendmmsg.
* sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise.
* sysdeps/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/oldrecvmmsg.c: New file.
* sysdeps/unix/sysv/linux/oldsendmmsg.c: Likewise.
* sysdeps/unix/sysv/linux/recvmmsg.c (__recvmmsg): Adjust msghdr
iovlen and controllen fields to adjust to POSIX specification.
* sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Likewise.
* conform/data/sys/socket.h-data (msghdr.msg_iovlen): Remove xfail-
and change to correct expected type.
(msghdr.msg_controllen): Likewise.

3
sysdeps/unix/sysv/linux/Makefile
View File

@ -124,7 +124,8 @@ ifeq ($(subdir),socket)
sysdep_headers += net/if_ppp.h net/ppp-comp.h \
net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
net/if_slip.h net/if_packet.h net/if_shaper.h
sysdep_routines += cmsg_nxthdr oldrecvmsg oldsendmsg
sysdep_routines += cmsg_nxthdr oldrecvmsg oldsendmsg \
oldrecvmmsg oldsendmmsg
CFLAGS-recvmsg.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-oldrecvmsg.c = -fexceptions -fasynchronous-unwind-tables

2
sysdeps/unix/sysv/linux/aarch64/libc.abilist
View File

@ -2088,5 +2088,7 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F

2
sysdeps/unix/sysv/linux/alpha/libc.abilist
View File

@ -1999,7 +1999,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F

2
sysdeps/unix/sysv/linux/ia64/libc.abilist
View File

@ -1875,7 +1875,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F

2
sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
View File

@ -1933,7 +1933,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F

87
sysdeps/unix/sysv/linux/oldrecvmmsg.c Normal file
View File

@ -0,0 +1,87 @@
/* Compatibility version of recvmsg.
Copyright (C) 2010-2016 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 <sys/socket.h>
#include <sysdep-cancel.h>
#include <socketcall.h>
#include <shlib-compat.h>
#if __WORDSIZE == 64
# if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_24)
/* Do not use the recvmmsg 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_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_RECVMMSG_SYSCALL
# undef __NR_recvmmsg
# endif
int
__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen,
int flags, struct timespec *tmo)
{
# ifdef __NR_recvmmsg
return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
# elif defined __NR_socketcall
# ifdef __ASSUME_RECVMMSG_SOCKETCALL
return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
# else
static int have_recvmmsg;
if (__glibc_likely (have_recvmmsg >= 0))
{
int ret = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags,
tmo);
/* The kernel returns -EINVAL for unknown socket operations.
We need to convert that error to an ENOSYS error. */
if (__builtin_expect (ret < 0, 0)
&& have_recvmmsg == 0
&& errno == EINVAL)
{
/* Try another call, this time with an invalid file
descriptor and all other parameters cleared. This call
will not cause any harm and it will return
immediately. */
ret = SOCKETCALL_CANCEL (invalid, -1);
if (errno == EINVAL)
{
have_recvmmsg = -1;
__set_errno (ENOSYS);
}
else
{
have_recvmmsg = 1;
__set_errno (EINVAL);
}
return -1;
}
return ret;
}
__set_errno (ENOSYS);
return -1;
# endif /* __ASSUME_RECVMMSG_SOCKETCALL */
# else
__set_errno (ENOSYS);
return -1;
# endif
}
compat_symbol (libc, __old_recvmmsg, recvmmsg, GLIBC_2_12);
# endif /* SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_24) */
#endif /* __WORDSIZE == 64 */

76
sysdeps/unix/sysv/linux/oldsendmmsg.c Normal file
View File

@ -0,0 +1,76 @@
/* Compatibility implementation of sendmmsg.
Copyright (C) 2016 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 <sys/socket.h>
#include <sysdep-cancel.h>
#include <socketcall.h>
#include <shlib-compat.h>
#if __WORDSIZE == 64
# if SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24)
int
__old_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen,
int flags)
{
# ifdef __NR_sendmmsg
return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
# elif defined __NR_socketcall
# ifdef __ASSUME_SENDMMSG_SOCKETCALL
return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
# else
static int have_sendmmsg;
if (__glibc_likely (have_sendmmsg >= 0))
{
int ret = SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
/* The kernel returns -EINVAL for unknown socket operations.
We need to convert that error to an ENOSYS error. */
if (__builtin_expect (ret < 0, 0)
&& have_sendmmsg == 0
&& errno == EINVAL)
{
/* Try another call, this time with an invalid file
descriptor and all other parameters cleared. This call
will not cause any harm and it will return
immediately. */
ret = SOCKETCALL_CANCEL (invalid, -1);
if (errno == EINVAL)
{
have_sendmmsg = -1;
__set_errno (ENOSYS);
}
else
{
have_sendmmsg = 1;
__set_errno (EINVAL);
}
return -1;
}
return ret;
}
__set_errno (ENOSYS);
return -1;
# endif /* __ASSUME_SENDMMSG_SOCKETCALL */
# else /* defined __NR_socketcall */
__set_errno (ENOSYS);
return -1;
# endif
}
compat_symbol (libc, __old_sendmmsg, sendmmsg, GLIBC_2_14);
# endif /* SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24) */
#endif /* __WORDSIZE == 64 */

2
sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
View File

@ -2176,5 +2176,7 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F

2
sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
View File

@ -90,7 +90,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 _Exit F

63
sysdeps/unix/sysv/linux/recvmmsg.c
View File

@ -16,12 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/socket.h>
#include <socketcall.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <kernel-features.h>
#include <shlib-compat.h>
/* Do not use the recvmmsg syscall on socketcall architectures unless
it was added at the same time as the socketcall support or can be
@ -32,31 +30,39 @@
# undef __NR_recvmmsg
#endif
#ifdef __NR_recvmmsg
int
recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
struct timespec *tmo)
static inline void
adjust_mmsghdr (struct mmsghdr *vmessages, unsigned int vlen)
{
return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
}
#elif defined __NR_socketcall
# include <socketcall.h>
# ifdef __ASSUME_RECVMMSG_SOCKETCALL
int
recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
struct timespec *tmo)
#if __WORDSIZE == 64
/* POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen
to be int and socklen_t respectively. However Linux defines it as
both size_t. So for 64-bit it requires some adjustments by zeroing
the pad fields. */
struct mmsghdr *vmhdr = vmessages;
for (unsigned int i = 0; i != 0; i--, vmhdr++)
{
return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
vmhdr->msg_hdr.__glibc_reserved1 = 0;
vmhdr->msg_hdr.__glibc_reserved2 = 0;
}
#endif
}
# else
static int have_recvmmsg;
int
recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
struct timespec *tmo)
__recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen,
int flags, struct timespec *tmo)
{
#ifdef __NR_recvmmsg
adjust_mmsghdr (vmessages, vlen);
return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
#elif defined __NR_socketcall
# ifdef __ASSUME_RECVMMSG_SOCKETCALL
adjust_mmsghdr (vmessages, vlen);
return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
# else
static int have_recvmmsg;
if (__glibc_likely (have_recvmmsg >= 0))
{
adjust_mmsghdr (vmessages, vlen);
int ret = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags,
tmo);
/* The kernel returns -EINVAL for unknown socket operations.
@ -86,8 +92,19 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
}
__set_errno (ENOSYS);
return -1;
}
# endif /* __ASSUME_RECVMMSG_SOCKETCALL */
#else
# include <socket/recvmmsg.c>
# define STUB 1
__set_errno (ENOSYS);
return -1;
#endif
}
#ifdef STUB
stub_warning (recvmmsg)
#endif
#if __WORDSIZE == 64
versioned_symbol (libc, __recvmmsg, recvmmsg, GLIBC_2_24);
#else
weak_alias (__recvmmsg, recvmmsg)
#endif

2
sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
View File

@ -1872,7 +1872,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F

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

@ -16,12 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/socket.h>
#include <socketcall.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <kernel-features.h>
#include <shlib-compat.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
@ -32,31 +30,53 @@
# undef __NR_sendmmsg
#endif
#ifdef __NR_sendmmsg
int
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
#if __WORDSIZE == 64
static inline int
send_mmsghdr (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
{
return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
}
libc_hidden_def (__sendmmsg)
weak_alias (__sendmmsg, sendmmsg)
#elif defined __NR_socketcall
# include <socketcall.h>
# ifdef __ASSUME_SENDMMSG_SOCKETCALL
int
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
/* Emulate kernel interface for vlen size. */
if (vlen > IOV_MAX)
vlen = IOV_MAX;
if (vlen == 0)
return 0;
/* POSIX specifies that both msghdr::msg_iovlen and msghdr::msg_controllen
to be int and socklen_t respectively, however Linux defines it as both
size_t. So for 64-bit it requires some adjustments by copying to
temporary header and zeroing the pad fields.
The problem is sendmmsg's msghdr may points to an already-filled control
buffer and modifying it is not part of sendmmsg contract (the data may
be in ro map). So interact over the msghdr calling the sendmsg that
adjust the header using a temporary buffer. */
for (unsigned int i = 0; i < vlen; i++)
{
return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
ssize_t ret = __sendmsg (fd, &vmessages[i].msg_hdr, flags);
if (ret < 0)
return -1;
vmessages[i].msg_len = ret;
}
# else
static int have_sendmmsg;
return 1;
}
#endif
int
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
{
#if __WORDSIZE == 64
return send_mmsghdr (fd, vmessages, vlen, flags);
#elif defined __NR_sendmmsg
return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
#elif defined __NR_socketcall
# ifdef __ASSUME_SENDMMSG_SOCKETCALL
return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
# else
static int have_sendmmsg;
if (__glibc_likely (have_sendmmsg >= 0))
{
# if __WORDSIZE == 64
int ret = send_mmsghdr (fd, vmessages, vlen, flags);
# else
int ret = SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
# endif
/* The kernel returns -EINVAL for unknown socket operations.
We need to convert that error to an ENOSYS error. */
if (__builtin_expect (ret < 0, 0)
@ -84,10 +104,20 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
}
__set_errno (ENOSYS);
return -1;
}
# endif /* __ASSUME_SENDMMSG_SOCKETCALL */
libc_hidden_def (__sendmmsg)
weak_alias (__sendmmsg, sendmmsg)
#else
# include <socket/sendmmsg.c>
#else /* defined __NR_socketcall */
# define STUB 1
__set_errno (ENOSYS);
return -1;
#endif
}
#ifdef STUB
stub_warning (sendmmsg)
#endif
libc_hidden_def (__sendmmsg)
#if __WORDSIZE == 64
versioned_symbol (libc, __sendmmsg, sendmmsg, GLIBC_2_24);
#else
weak_alias (__sendmmsg, sendmmsg)
#endif

2
sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
View File

@ -1901,7 +1901,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F

2
sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
View File

@ -2095,5 +2095,7 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F

2
sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
View File

@ -1852,7 +1852,9 @@ GLIBC_2.23 fts64_open F
GLIBC_2.23 fts64_read F
GLIBC_2.23 fts64_set F
GLIBC_2.24 GLIBC_2.24 A
GLIBC_2.24 recvmmsg F
GLIBC_2.24 recvmsg F
GLIBC_2.24 sendmmsg F
GLIBC_2.24 sendmsg F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 __ctype_b_loc F