From patchwork Mon Jun 7 20:35:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 43755 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36556388A432 for ; Mon, 7 Jun 2021 20:39:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36556388A432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623098390; bh=vwT8K1nwtixvWik0XHUOGBTQ2KzDJ/DgJxbpe/WURcc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Z580/NksGQzAQLTgloMkIhITG/myOTMqxSfVbffst3kcReZgZaJYwCb5QtTvWR+tO lT5SSkNUF1LKpqPZmoVVqElyWd/uc8kjwPm0GZyCRGZfetslCkedOi3wXqH2Oc5z5p to90O44LUtEILSplXHRFHEy6OVbMaLE0W5wYTnaI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) by sourceware.org (Postfix) with ESMTPS id 51AB93938396 for ; Mon, 7 Jun 2021 20:36:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51AB93938396 Received: by mail-qt1-x82a.google.com with SMTP id p21so1889910qtw.6 for ; Mon, 07 Jun 2021 13:36:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vwT8K1nwtixvWik0XHUOGBTQ2KzDJ/DgJxbpe/WURcc=; b=DNGnaGCmOOapUgUntUMao+6SJGTPsdZ54Y4i6d3M0sWFfTeFkk7Xc/RUV113Df5EA/ gRAdv8hmP/RNFyA7TtmnrordszIrgJk4xxqsU+UPUptKBWhqpqu+m4zpDm9J8XgxIepK lsUnqy+Jx1lEcKhVC+P7invIqISgctnrK2Bv3sDtXuNSE38bs67Fuwg4YLMSrr3NGPbX resbHCPpmecfGD/cojbMWtCD3kKqL/sh86k5/g3ytebfud8q5bnKfwY+I658WzoQpcw9 g/luE5N8wOKLOpVhxYNPBR4mu1pyFaJcGKfbehJuJILniDdwCrSiqXET/eNtVNtFKGzc 8StA== X-Gm-Message-State: AOAM530IG3lrVfYlDXldNURpn9G7sJt4v1nisRHkX852+YyG3HTneFwM kS5yLNuVXIOt6CBdZibdeH8Z3J4tVonhVg== X-Google-Smtp-Source: ABdhPJyxfPAkMiS0jb4/frw9ydk+J750YuQiLI00eECXvrPC6Bi8trsEInbuIqdZhVUrgdc9S72KQA== X-Received: by 2002:ac8:5784:: with SMTP id v4mr17989309qta.264.1623098185649; Mon, 07 Jun 2021 13:36:25 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.googlemail.com with ESMTPSA id t196sm10422123qke.50.2021.06.07.13.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 13:36:25 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3 04/24] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Date: Mon, 7 Jun 2021 17:35:53 -0300 Message-Id: <20210607203613.282543-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607203613.282543-1-adhemerval.zanella@linaro.org> References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The constant values will be changed for __TIMESIZE=64, so binaries built with 64-bit time support might fail to work properly on old kernels. Both {get,set}sockopt will retry the syscall with the old constant values and the timeout value adjusted when kernel returns ENOTPROTOPT. It also adds an internal only SO_{RCV,SND}TIMEO where COMPAT_SO_{RCV,SND}TIMEO_OLD indicates pre 32 bit time support and COMPAT_SO_{RCV,SND}TIMEO_NEW indicates time64 support. It allows to refer to constant independently of the time_t ABI and kernel version used. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Carlos O'Donell Tested-by: carlos O'Donell --- sysdeps/unix/sysv/linux/getsockopt.c | 70 ++++++++++++++++-- .../sysv/linux/hppa/socket-constants-time64.h | 30 ++++++++ .../sysv/linux/mips/socket-constants-time64.h | 30 ++++++++ .../linux/powerpc/socket-constants-time64.h | 30 ++++++++ sysdeps/unix/sysv/linux/setsockopt.c | 71 ++++++++++++++++--- .../unix/sysv/linux/socket-constants-time64.h | 30 ++++++++ .../linux/sparc/socket-constants-time64.h | 30 ++++++++ 7 files changed, 276 insertions(+), 15 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h create mode 100644 sysdeps/unix/sysv/linux/mips/socket-constants-time64.h create mode 100644 sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h create mode 100644 sysdeps/unix/sysv/linux/socket-constants-time64.h create mode 100644 sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h diff --git a/sysdeps/unix/sysv/linux/getsockopt.c b/sysdeps/unix/sysv/linux/getsockopt.c index 76ee8a94d6..688a7de087 100644 --- a/sysdeps/unix/sysv/linux/getsockopt.c +++ b/sysdeps/unix/sysv/linux/getsockopt.c @@ -15,16 +15,15 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include - +#include +#include #include -#include -#include +#include -int -__getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) +static int +getsockopt_syscall (int fd, int level, int optname, void *optval, + socklen_t *len) { #ifdef __ASSUME_GETSOCKOPT_SYSCALL return INLINE_SYSCALL (getsockopt, 5, fd, level, optname, optval, len); @@ -32,4 +31,61 @@ __getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) return SOCKETCALL (getsockopt, fd, level, optname, optval, len); #endif } + +#ifndef __ASSUME_TIME64_SYSCALLS +static int +getsockopt32 (int fd, int level, int optname, void *optval, + socklen_t *len) +{ + int r = -1; + + if (level != SOL_SOCKET) + return r; + + switch (optname) + { + case COMPAT_SO_RCVTIMEO_NEW: + case COMPAT_SO_SNDTIMEO_NEW: + { + if (optname == COMPAT_SO_RCVTIMEO_NEW) + optname = COMPAT_SO_RCVTIMEO_OLD; + if (optname == COMPAT_SO_SNDTIMEO_NEW) + optname = COMPAT_SO_SNDTIMEO_OLD; + + struct __timeval32 tv32; + r = getsockopt_syscall (fd, level, optname, &tv32, + (socklen_t[]) { sizeof tv32 }); + if (r < 0) + break; + + /* POSIX states that if the size of the option value is greater than + then option length, the option value argument shall be silently + truncated. */ + if (*len >= sizeof (struct __timeval64)) + { + struct __timeval64 *tv64 = (struct __timeval64 *) optval; + *tv64 = valid_timeval32_to_timeval64 (tv32); + *len = sizeof (*tv64); + } + else + memcpy (optval, &tv32, sizeof tv32); + } + } + + return r; +} +#endif + +int +__getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) +{ + int r = getsockopt_syscall (fd, level, optname, optval, len); + +#ifndef __ASSUME_TIME64_SYSCALLS + if (r == -1 && errno == ENOPROTOOPT) + r = getsockopt32 (fd, level, optname, optval, len); +#endif + + return r; +} weak_alias (__getsockopt, getsockopt) diff --git a/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h new file mode 100644 index 0000000000..9fe7576aaa --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h @@ -0,0 +1,30 @@ +/* Compat socket constants used in 64-bit compat code. + Copyright (C) 2021 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 + . */ + +#ifndef _SOCKET_CONSTANTS_TIME64_H +#define _SOCKET_CONSTANTS_TIME64_H + +/* The compat code requires the SO_* constants used for both 32 and 64-bit + time_t, however they were only added on v5.1 kernel. */ + +#define COMPAT_SO_RCVTIMEO_OLD 4102 +#define COMPAT_SO_SNDTIMEO_OLD 4101 +#define COMPAT_SO_RCVTIMEO_NEW 16448 +#define COMPAT_SO_SNDTIMEO_NEW 16449 + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h new file mode 100644 index 0000000000..1252a8a23b --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h @@ -0,0 +1,30 @@ +/* Compat socket constants used in 64-bit compat code. + Copyright (C) 2021 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 + . */ + +#ifndef _SOCKET_CONSTANTS_TIME64_H +#define _SOCKET_CONSTANTS_TIME64_H + +/* The compat code requires the SO_* constants used for both 32 and 64-bit + time_t, however they were only added on v5.1 kernel. */ + +#define COMPAT_SO_RCVTIMEO_OLD 4102 +#define COMPAT_SO_SNDTIMEO_OLD 4101 +#define COMPAT_SO_RCVTIMEO_NEW 66 +#define COMPAT_SO_SNDTIMEO_NEW 67 + +#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h new file mode 100644 index 0000000000..26e8b710ab --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h @@ -0,0 +1,30 @@ +/* Compat socket constants used in 64-bit compat code. + Copyright (C) 2021 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 + . */ + +#ifndef _SOCKET_CONSTANTS_TIME64_H +#define _SOCKET_CONSTANTS_TIME64_H + +/* The compat code requires the SO_* constants used for both 32 and 64-bit + time_t, however they were only added on v5.1 kernel. */ + +#define COMPAT_SO_RCVTIMEO_OLD 18 +#define COMPAT_SO_SNDTIMEO_OLD 19 +#define COMPAT_SO_RCVTIMEO_NEW 66 +#define COMPAT_SO_SNDTIMEO_NEW 67 + +#endif diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c index 12fd7bdcde..6505202265 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c +++ b/sysdeps/unix/sysv/linux/setsockopt.c @@ -15,21 +15,76 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include - +#include +#include #include -#include -#include +#include -int -setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) +static int +setsockopt_syscall (int fd, int level, int optname, const void *optval, + socklen_t len) { #ifdef __ASSUME_SETSOCKOPT_SYSCALL - return INLINE_SYSCALL (setsockopt, 5, fd, level, optname, optval, len); + return INLINE_SYSCALL_CALL (setsockopt, fd, level, optname, optval, len); #else return SOCKETCALL (setsockopt, fd, level, optname, optval, len); #endif } + +#ifndef __ASSUME_TIME64_SYSCALLS +static int +setsockopt32 (int fd, int level, int optname, const void *optval, + socklen_t len) +{ + int r = -1; + + if (level != SOL_SOCKET) + return r; + + switch (optname) + { + case COMPAT_SO_RCVTIMEO_NEW: + case COMPAT_SO_SNDTIMEO_NEW: + { + if (len < sizeof (struct __timeval64)) + { + __set_errno (EINVAL); + break; + } + + struct __timeval64 *tv64 = (struct __timeval64 *) optval; + if (! in_time_t_range (tv64->tv_sec)) + { + __set_errno (EOVERFLOW); + break; + } + + if (optname == COMPAT_SO_RCVTIMEO_NEW) + optname = COMPAT_SO_RCVTIMEO_OLD; + if (optname == COMPAT_SO_SNDTIMEO_NEW) + optname = COMPAT_SO_SNDTIMEO_OLD; + + struct __timeval32 tv32 = valid_timeval64_to_timeval32 (*tv64); + + r = setsockopt_syscall (fd, level, optname, &tv32, sizeof (tv32)); + } + } + + return r; +} +#endif + +int +setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) +{ + int r = setsockopt_syscall (fd, level, optname, optval, len); + +#ifndef __ASSUME_TIME64_SYSCALLS + if (r == -1 && errno == ENOPROTOOPT) + r = setsockopt32 (fd, level, optname, optval, len); +#endif + + return r; +} weak_alias (setsockopt, __setsockopt) diff --git a/sysdeps/unix/sysv/linux/socket-constants-time64.h b/sysdeps/unix/sysv/linux/socket-constants-time64.h new file mode 100644 index 0000000000..d09c39d6c2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/socket-constants-time64.h @@ -0,0 +1,30 @@ +/* Compat socket constants used in 64-bit compat code. + Copyright (C) 2021 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 + . */ + +#ifndef _SOCKET_CONSTANTS_TIME64_H +#define _SOCKET_CONSTANTS_TIME64_H + +/* The compat code requires the SO_* constants used for both 32 and 64-bit + time_t, however they were only added on v5.1 kernel. */ + +#define COMPAT_SO_RCVTIMEO_OLD 20 +#define COMPAT_SO_SNDTIMEO_OLD 21 +#define COMPAT_SO_RCVTIMEO_NEW 66 +#define COMPAT_SO_SNDTIMEO_NEW 67 + +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h new file mode 100644 index 0000000000..f4668db537 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h @@ -0,0 +1,30 @@ +/* Compat socket constants used in 64-bit compat code. + Copyright (C) 2021 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 + . */ + +#ifndef _SOCKET_CONSTANTS_TIME64_H +#define _SOCKET_CONSTANTS_TIME64_H + +/* The compat code requires the SO_* constants used for both 32 and 64-bit + time_t, however they were only added on v5.1 kernel. */ + +#define COMPAT_SO_RCVTIMEO_OLD 8192 +#define COMPAT_SO_SNDTIMEO_OLD 16384 +#define COMPAT_SO_RCVTIMEO_NEW 68 +#define COMPAT_SO_SNDTIMEO_NEW 69 + +#endif