From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 6469239C5036; Thu, 4 Mar 2021 11:28:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6469239C5036 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 08cfbdd788bf6bee4d5e06d90fe27b5b332579d9 X-Git-Newrev: 488ba1600d7804bfb033cfbc5ac9c7d0397081df Message-Id: <20210304112851.6469239C5036@sourceware.org> Date: Thu, 4 Mar 2021 11:28:51 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 11:28:51 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=488ba1600d7804bfb033cfbc5ac9c7d0397081df commit 488ba1600d7804bfb033cfbc5ac9c7d0397081df Author: Adhemerval Zanella Date: Mon Sep 7 14:13:58 2020 -0300 linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO 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). Diff: --- sysdeps/unix/sysv/linux/getsockopt.c | 67 +++++++++++++++++--- .../unix/sysv/linux/hppa/socket-constants-time64.h | 30 +++++++++ .../unix/sysv/linux/mips/socket-constants-time64.h | 30 +++++++++ .../sysv/linux/powerpc/socket-constants-time64.h | 30 +++++++++ sysdeps/unix/sysv/linux/setsockopt.c | 71 +++++++++++++++++++--- sysdeps/unix/sysv/linux/socket-constants-time64.h | 30 +++++++++ .../sysv/linux/sparc/socket-constants-time64.h | 30 +++++++++ 7 files changed, 273 insertions(+), 15 deletions(-) diff --git a/sysdeps/unix/sysv/linux/getsockopt.c b/sysdeps/unix/sysv/linux/getsockopt.c index 76ee8a94d6..c8e502d976 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,58 @@ __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 (*len < sizeof (struct __timeval64)) + { + __set_errno (EINVAL); + 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; + r = getsockopt_syscall (fd, level, optname, &tv32, + (socklen_t[]) { sizeof tv32 }); + if (r < 0) + break; + struct __timeval64 *tv64 = (struct __timeval64 *) optval; + *tv64 = valid_timeval32_to_timeval64 (tv32); + *len = sizeof (*tv64); + } + } + + 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..ea721e0fc2 --- /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..ab8bd62853 --- /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..1e48dcca8d --- /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..e5a3777f28 --- /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..b137abdeea --- /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