From patchwork Mon Mar 21 20:41:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 64138 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1645406lbc; Mon, 21 Mar 2016 13:42:23 -0700 (PDT) X-Received: by 10.66.141.103 with SMTP id rn7mr20256993pab.70.1458592943168; Mon, 21 Mar 2016 13:42:23 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id f18si16838602pfd.206.2016.03.21.13.42.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Mar 2016 13:42:23 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-68261-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libc-alpha-return-68261-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-68261-patch=linaro.org@sourceware.org; dkim=pass header.i=@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=lx1WKIfpJOrHABsYSxuaSCOYnWhowg3 V/j0rRHj20xgg7M5nTbYu0iZHj2KCzXarSsUFiGcCQaBfUcTpgT81S81RzaqBtUW pDX5zAQXyWzWO7ffjZjxuS5345O1VNgzeFlH+uxjEHM7kPd3paiCVCoNonWvqiDp yPy7aLwXHcAk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=ai6+wl1iogqEx1lXPZ7nFB52eOw=; b=CX02w WbXxk0g/EPGNtVIfb3mXIjcDk/sjnVnCg12AyfmDMzJPa3lFdLYewU0elzrzCwqT px0/u0pT4uPfTV848kTLJNeMTOlxCFxgHFA7Uwo3MTcCIYKWwifjx+sqNgQFVh4r U+MxSRssgvRhr2rMJbWJizQUPqFU0nmyioYiE4= Received: (qmail 3539 invoked by alias); 21 Mar 2016 20:42:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 3519 invoked by uid 89); 21 Mar 2016 20:42:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=EINVAL, einval, harm, rewritten X-HELO: mail-yw0-f178.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=HL3NDycX79/CeythgBdW3IyOatIvo+mCa87PLTy3JwY=; b=OfF6NbH/juSDDi+hcQsAuz01NxrfuHEE5L9fAhAJw/K7aE+6oVIrA63WVwirUYBj3y fkQCmaiEOkMCjtrYzF90XPETApltZc0iivskCcNTzRbhJjx2bTsWHojyqbpYyhaBRYi0 GiX6/TDg8YIDHQ4OYeoZrMVItDEU0MTC1DyGhSc3sEXvMzJpQIbJLUfJ+FuSy4bx+VT2 KtLtpHYllAJ5uAWAMTOg+809zP5af6x6cvIqd+bSh8xtRpF3PCjHh/CIT1YUyqqPukP/ 6a72SN1oIiN42vbUuGXfl0I/6lYR1HS475Gf0KJLIZvpqku/S+v2rjmtJ+5StUnhR7yk kXyQ== X-Gm-Message-State: AD7BkJKPeNKll8JjjYBcZQg4KEJsp5qtbvDQlisFQD+XAhYqJ6uFHA6mko8tI5SJBJGAHbPP X-Received: by 10.129.4.197 with SMTP id 188mr16338815ywe.184.1458592881220; Mon, 21 Mar 2016 13:41:21 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/4] network: recvmmsg and sendmmsg standard compliance (BZ#16919) Date: Mon, 21 Mar 2016 17:41:07 -0300 Message-Id: <1458592867-3057-5-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1458592867-3057-1-git-send-email-adhemerval.zanella@linaro.org> References: <1458592867-3057-1-git-send-email-adhemerval.zanella@linaro.org> 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/i386/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove define. [__LINUX_KERNEL_VERSION > 0x030000] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Add define. * sysdeps/unix/sysv/linux/m68k/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove define. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/s390/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Add define. (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/sh/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Remove define. * sysdeps/unix/sysv/linux/sparc/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Remove file. * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: 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. --- sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/aarch64/libc.abilist | 2 + sysdeps/unix/sysv/linux/alpha/libc.abilist | 2 + sysdeps/unix/sysv/linux/ia64/libc.abilist | 2 + .../unix/sysv/linux/microblaze/kernel-features.h | 2 + .../unix/sysv/linux/mips/mips64/n64/libc.abilist | 2 + sysdeps/unix/sysv/linux/oldrecvmmsg.c | 91 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/oldsendmmsg.c | 90 +++++++++++++++++++++ .../sysv/linux/powerpc/powerpc64/libc-le.abilist | 2 + .../unix/sysv/linux/powerpc/powerpc64/libc.abilist | 2 + sysdeps/unix/sysv/linux/recvmmsg.c | 49 ++++++++++-- sysdeps/unix/sysv/linux/s390/kernel-features.h | 3 + sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 2 + sysdeps/unix/sysv/linux/sendmmsg.c | 56 ++++++++++++- sysdeps/unix/sysv/linux/sh/kernel-features.h | 3 - sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 2 + .../sysv/linux/tile/tilegx/tilegx64/libc.abilist | 2 + sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 2 + 19 files changed, 348 insertions(+), 14 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/oldrecvmmsg.c create mode 100644 sysdeps/unix/sysv/linux/oldsendmmsg.c -- 1.9.1 diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 4475a5c..512143c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -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 endif ifeq ($(subdir),sunrpc) diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index c3f2346..7981817 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 7822242..0c1e1ac 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index f5739b4..b1388d1 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index e25b6ed..b573911 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -20,6 +20,8 @@ #define __ASSUME_SOCKETCALL 1 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 +#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 + /* All supported kernel versions for MicroBlaze have these syscalls. */ #define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 6722f90..0e2ff75 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/oldrecvmmsg.c b/sysdeps/unix/sysv/linux/oldrecvmmsg.c new file mode 100644 index 0000000..d01fff7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/oldrecvmmsg.c @@ -0,0 +1,91 @@ +/* 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 + . */ + +#include +#include +#include +#include + +#if LONG_MAX > INT_MAX +# if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_24) + +# ifdef __ASSUME_RECVMMSG_SYSCALL +int +__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) +{ + return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); +} +# elif defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL +int +__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) +{ + return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); +} +# elif defined __ASSUME_SOCKETCALL +static int have_recvmmsg; + +int +__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) +{ + 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; +} +# else +int +__old_recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags, struct timespec *tmo) +{ + __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 /* LONG_MAX > INT_MAX */ diff --git a/sysdeps/unix/sysv/linux/oldsendmmsg.c b/sysdeps/unix/sysv/linux/oldsendmmsg.c new file mode 100644 index 0000000..7970b73 --- /dev/null +++ b/sysdeps/unix/sysv/linux/oldsendmmsg.c @@ -0,0 +1,90 @@ +/* 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 + . */ + +#include +#include +#include +#include + +#if LONG_MAX > INT_MAX +# if SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24) + +# ifdef __ASSUME_SENDMMSG_SYSCALL +int +__old_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags) +{ + return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +} +# elif defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL +int +__old_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags) +{ + return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +} +# elif defined __ASSUME_SOCKETCALL +static int have_sendmmsg; + +int +__old_sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, + int flags) +{ + 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; +} +# else +# define __sendmmsg __old_sendmmsg +# undef libc_hidden_def +# define libc_hidden_def(name) +# undef weak_alias +# define weak_alias(name, alias) +# include +# endif + +compat_symbol (libc, __old_sendmmsg, sendmmsg, GLIBC_2_14); +# endif /* SHLIB_COMPAT (libc, GLIBC_2_14, GLIBC_2_24) */ +#endif /* LONG_MAX > INT_MAX */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist index 7839b5a..85286c4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist index 20d5a19..0abd098 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index fb3f325..9cb03d1 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -21,29 +21,49 @@ #include #include +static inline void +adjust_mmsghdr (struct mmsghdr *vmessages, unsigned int vlen) +{ +#if LONG_MAX > INT_MAX + /* 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++) + { + vmhdr->msg_hdr.__glibc_reserved1 = 0; + vmhdr->msg_hdr.__glibc_reserved2 = 0; + } +#endif +} + #ifdef __ASSUME_RECVMMSG_SYSCALL 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) { + adjust_mmsghdr (vmessages, vlen); return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); } #elif defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 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) { + adjust_mmsghdr (vmessages, vlen); return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); } #elif defined __ASSUME_SOCKETCALL 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) { 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. @@ -75,5 +95,20 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, return -1; } #else /* __ASSUME_RECVMMSG_SOCKETCALL */ -# include +/* Receive up to VLEN messages as described by VMESSAGES from socket FD. + Returns the number of bytes read or -1 for errors. */ +int +__recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, + struct timespec *tmo) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (recvmmsg) #endif + +# if LONG_MAX > INT_MAX +versioned_symbol (libc, __recvmmsg, recvmmsg, GLIBC_2_24); +# else +weak_alias (__recvmmsg, recvmmsg) +# endif diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h index 4656c4a..4e7b030 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h @@ -22,6 +22,9 @@ #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 #define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 +#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 +#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 + /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 # define __ASSUME_SOCKET_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 5892fcd..03a9b97 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/sendmmsg.c b/sysdeps/unix/sysv/linux/sendmmsg.c index 37f0ec9..1f40f41 100644 --- a/sysdeps/unix/sysv/linux/sendmmsg.c +++ b/sysdeps/unix/sysv/linux/sendmmsg.c @@ -19,23 +19,58 @@ #include #include #include +#include + +#if LONG_MAX > INT_MAX +static inline int +send_mmsghdr (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++) + { + ssize_t ret = __sendmsg (fd, &vmessages[i].msg_hdr, flags); + if (ret < 0) + return -1; + vmessages[i].msg_len = ret; + } + return 1; +} +#endif #ifdef __ASSUME_SENDMMSG_SYSCALL int __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) { +# if LONG_MAX > INT_MAX + return send_mmsghdr (fd, vmessages, vlen, flags); +# else return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +# endif } libc_hidden_def (__sendmmsg) -weak_alias (__sendmmsg, sendmmsg) #elif defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL int __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) { +# if LONG_MAX > INT_MAX + return send_mmsghdr (fd, vmessages, vlen, flags); +# else return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); +# endif } libc_hidden_def (__sendmmsg) -weak_alias (__sendmmsg, sendmmsg) #elif defined __ASSUME_SOCKETCALL static int have_sendmmsg; @@ -44,7 +79,11 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) { if (__glibc_likely (have_sendmmsg >= 0)) { +# if LONG_MAX > INT_MAX + 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) @@ -55,7 +94,11 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) descriptor and all other parameters cleared. This call will not cause any harm and it will return immediately. */ +# if LONG_MAX > INT_MAX + ret = send_mmsghdr (fd, vmessages, vlen, flags); +# else ret = SOCKETCALL_CANCEL (invalid, -1); +# endif if (errno == EINVAL) { have_sendmmsg = -1; @@ -74,7 +117,14 @@ __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) return -1; } libc_hidden_def (__sendmmsg) -weak_alias (__sendmmsg, sendmmsg) #else /* __ASSUME_SENDMMSG_SOCKETCALL */ +# undef weak_alias +# define weak_alias(name, alias) # include #endif + +#if LONG_MAX > INT_MAX +versioned_symbol (libc, __sendmmsg, sendmmsg, GLIBC_2_24); +#else +weak_alias (__sendmmsg, sendmmsg) +#endif diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index ad05fc3..be50320 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -37,9 +37,6 @@ #define __ASSUME_GETSOCKOPT_SYSCALL 1 #define __ASSUME_SETSOCKOPT_SYSCALL 1 -/* The sendmmsg syscall was added for SH in 3.0. */ -#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1 - #include_next /* SH does not have a 64-bit inode field. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index 015a2f1..38b976f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist index 1e160bd..07b1332 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist +++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist @@ -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 diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 175339e..baea1f5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -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