From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2111.outbound.protection.outlook.com [40.107.117.111]) by sourceware.org (Postfix) with ESMTPS id 4E9903858C55 for ; Tue, 8 Nov 2022 04:51:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4E9903858C55 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=cipunited.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cipunited.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OdRQtKoHeDJmDhHyMEBZ+CZOl9ZKfcon3bV6aF0B54XKWHd6OUtDfsV1nPVM9dMFMLUuhU3POMD63vdS9oim0KUGmga6R+nlWaUpCh7HTNa2zD0x+tahJW128oGX67+ESY1ahWbC5WPzhtWYHH54V0lx/2JWfYIhuX8f9E9RXt7qM2Qza9d5KZTkTh9O6rb1G5NPuqysWpHRf2a3R6CqXZHg3KFeccjv4A3nBDHdI+a78hb7EWtglincqFmIDuqa7k/VSWMVkAkL3X8wQWBhOqMFWq2EUj0NUbHU/FZ6+lE8eaVrj5N49D7l3Wmog2LZR1R1WQB0Ermj1raoJbKEtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eVtMXCPX/c94EtlLbjUQ6wTmoYi3iP8vB3w/qBiUUNM=; b=ZDHXMhvhSQNFmU+gQrLX3I26fYbsTDEMpzGkwoyns2MNmko+QdEPST5fK1BIuI4PH7lHEC6wND6fBG4SqyAYkcW8/ahbRfa5dQUEM8jpbhuKlZ8tUe0eZ69C6hGAwP9tSBdWlDDV5qtjTRvf1XKTF+ITDs66tbYM6IN6uHES/9B6jWorHX9ymjegm0q7MBJ8m5jXPywch3QIOcZQpQdSA3WrSh5PiEme/3C86O/EhcyijUjmAzoOBm25YASz8x1cSF7rbGeGiBbxloZ5/IGHewHw0nOBsmA0cinfld4nXa1BMAWXgO5C6cbSyfEeZbOktvBUGxX0jn9HJx7b30lEGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cipunited.com; dmarc=pass action=none header.from=cipunited.com; dkim=pass header.d=cipunited.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipunited.onmicrosoft.com; s=selector1-cipunited-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eVtMXCPX/c94EtlLbjUQ6wTmoYi3iP8vB3w/qBiUUNM=; b=tbphgpt1p1kPOhztx+Cxn+Qv8hVcVcrggppkSLsI3tB/vXpJPJXzShwkuB5ljaikTqz9GMRl2MiQrV8q0/W4oYfMQ/Z7ZyM56zRhPTELEpQvnoAq2HvmdMKJWw0AfNQVIREosfUg+pHUYK07GwvMcjV83mnG74okI6CoWBJZKVM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cipunited.com; Received: from TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) by SI2PR04MB5704.apcprd04.prod.outlook.com (2603:1096:4:1bf::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.11; Tue, 8 Nov 2022 04:51:03 +0000 Received: from TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::b90b:b8e8:9ec0:b5eb]) by TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::b90b:b8e8:9ec0:b5eb%4]) with mapi id 15.20.5813.011; Tue, 8 Nov 2022 04:51:02 +0000 From: YunQiang Su To: libc-alpha@sourceware.org Cc: aurelien@aurel32.net, adhemerval.zanella@linaro.org, jiaxun.yang@flygoat.com, macro@orcam.me.uk, syq@debian.org, YunQiang Su Subject: [PATCH v3] Define in_int32_t_range to check if the 64 bit time_t syscall should be used Date: Tue, 8 Nov 2022 12:49:46 +0800 Message-Id: <20221108044945.2173509-1-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221104013913.1543593-1-yunqiang.su@cipunited.com> References: <20221104013913.1543593-1-yunqiang.su@cipunited.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCPR01CA0156.jpnprd01.prod.outlook.com (2603:1096:400:2b1::16) To TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR04MB6117:EE_|SI2PR04MB5704:EE_ X-MS-Office365-Filtering-Correlation-Id: a713eccd-b231-4c60-6140-08dac144d656 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qDWjNfZpIW+srKJwJUk9zy9ynMksHksdYpXJwVW33/MxfRv/K902z7AoEYST3l3CbAmvx2WWZFT2sx8G8S2XMCgu4ysOLN2L+MPIQI/p8oGCscR42CqxyYIUSqIVor59v+nOukVxIzcomlZQrrBHhYszECe2clxnhILP4V3sBr5eov41Hdet/DEiIDi/yTHjQ6cQLJ1dZaW1C5BBtif/+T8XfH1AsDR9o1NVwdccb9t5qRxjwe2uKZeUgw5Igalgi67kVxEStxQelqCdxY0lBKjTzS9omNIRSYxXZJllbsJ4RirSJY6HN1xEv6YRD6GWeZsBu8Wo1X3MSQ9H8zjFg8PbvlzWc+vZVqTDP4ZwqQb+VP86GtGoSfS6GCLWxbkV+Pnrooq33+Ehd5Ab2LnBuugC336KXz3NH1lHcpqj+rnFvWmt3iBzYGRgkGzW5WhbEXUJabWKKu5f1GMDpMQ0Dh6kHxyAjmHBVsZv6JLuUPAVpzs3VQMq/7JMrRWiRyan0Zafn1IGxUMqyrLmd1XrlRnYJ8AYCuFkbiHecfOfyDgkDFnQ1wQc8+0cbYynowe1QwLsASbXyql8+eQVKd2fWfrltqC/dxzmF4a9pAbxEeQ50WZK60w+V9dkbHJ/IQ6knw8RHMXKUky1yjwZMnI/fYKV7rsgQaeGZkBwr8TPYiZFu0iEbsbIO1qETcs08R79evxx0mLCS1vxM5W5MBZNFseJCphcMvpbF2eR5/+mORfjMZdOmD96wzVsVVZ0dmxdwKwV5xXVSdl0l8CsoxCW6v+lWueuoQn4CxATSxb8GAM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR04MB6117.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(366004)(346002)(396003)(39830400003)(376002)(451199015)(36756003)(2906002)(1076003)(41300700001)(8936002)(38100700002)(38350700002)(186003)(83380400001)(43170500006)(86362001)(30864003)(26005)(4326008)(66476007)(6916009)(66556008)(2616005)(6506007)(6512007)(66946007)(478600001)(316002)(8676002)(6486002)(6666004)(107886003)(52116002)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CsjrV9xG75G2P9BYbBHRhsfXugVOuugtxmJ1ZBaHdOKOelvqvy+893QVjHB+?= =?us-ascii?Q?VqjRWMQAMc2LzAhF9gmJnJ7BuxQ0tqbBe7zqHD1eT+M+KCVY6ueFILgMBS8n?= =?us-ascii?Q?ILhKFFCQul2O3Gp0ER3sDaMWnWvayavORyN0wyoy7jKZEc85zlJ5+8PYurN/?= =?us-ascii?Q?iT5grh3HknJaOWlT1FEusxu7vA6jIaIC8S762AY8xvS4nxlW83r1gsmV5S5n?= =?us-ascii?Q?CyG8TY+x434wpjroC4IQTMx7Yv8BZIo4deQnhZCWUxoYRnIsRIKXV0kAI39f?= =?us-ascii?Q?/GAUOHRpjFBsheWPLl5Mhp1EmS9PE6v2iBiTar2Icflmw511wUyiIHfkq6tl?= =?us-ascii?Q?ERWb1rLHDwMj3/G8/bzZXqx7+CqNMzKe9BJcOygTMoxqQSK4JosnrbE2u1bc?= =?us-ascii?Q?jj9UZ6pEPPwbPymFgUhHZDGKvbr7FNWLkhy733eljtOmcO5h0QzAS5QKtHbJ?= =?us-ascii?Q?fDY3TC8/9Gs+GvVUYOmrlMWM4rOD9QD0BXBCMGJfEj6X8+/4t7iF2TMk6GCA?= =?us-ascii?Q?XvUC0re4Yyeos27n0MHq9ED+HTkp6zlGYKQigGVNlr9mZNAexR7Axu2rF4Nb?= =?us-ascii?Q?VLvg6wz0g3VFuSJuJeHoPNIDLQKHvt+4iuLnOabuBe9mokHdSvYErHCEPJwA?= =?us-ascii?Q?CbDqgwntMnA8gBWzCpTj9BSpGsVkhO62xCcA4NpQfjkHvKE8B4DxBJH+CKSb?= =?us-ascii?Q?rOAXcfhDmL7fLTIbpx8HqI0lkUQEnYtoLbs480s4BEq4iHnkYMdI/VVyg8yj?= =?us-ascii?Q?RHL/dvUsIkRqSvYpivKnb+c3KepIHU8mDu0fmyw9VK3yAbXSkazo1+dSyqkg?= =?us-ascii?Q?U97QQlg1+ZOuD4qSv6IFvNpzWKiCKYwwk1q4sdfb81EsDCFiWPhJm83iy7kl?= =?us-ascii?Q?3IlfFs6wo1w0l0Ck6nzbddN3nnPrJNsdCW6ANmAAaPAMr0ddOOShAAx1DUzO?= =?us-ascii?Q?LhdXH9+NefEqOb2Aq2NddjCqZn75gxArHIEaGSwqCBh/kJTp9c9t9XY1vwn3?= =?us-ascii?Q?dMzRvgulKQ0LS68WjMpV+tWMjEeqg29HzWB/tvwYW+gCQwGVasJj3XQRA2Gy?= =?us-ascii?Q?tM4Z4okH9nFA8OwzLgqX3ZkTH+TOu39ipU4gSsvvRkb19Qa16NMQIW+KtqX1?= =?us-ascii?Q?PenS+H6tCNMMCz9iP+6jnjyFvRu/OVf2bx2FZtwX0ZNQag7ssoxMmbNHiYrW?= =?us-ascii?Q?rwadFET36qxImLQI58CskfjW3VvjZs9ZHQYohTOulnsxH64FeXgdKLf6Bj1p?= =?us-ascii?Q?AHUTqSxvX2+dirz3CTg1RPpV7tv+oh1anno3OphlAGFYdAguugWIr5vXGOUl?= =?us-ascii?Q?dS9RZaOOTTmrbveooKnql/TBtRLu1zvUD82mJZqLP6Gd5TL2e23m8TCsVQHP?= =?us-ascii?Q?SNHh8CymfXYHh1d9xh8yLPxCDqXsIM4iLSNTBD1Y+jZ8wT46KqX33jKJTxAs?= =?us-ascii?Q?b9c2ukPyAbtGMMWGgqOWrjlhTu1PlkONzKPWUmJMVIGOkWhXJfcNiv/mScl4?= =?us-ascii?Q?kwIS/rKIOEplHUSrKgTRlJlu4KuvpvH3yubRAxEyZ/m8xJsy04OfHmczLzGB?= =?us-ascii?Q?VjKK/SyuukKdqHujhBG1fhhnjqXWuJv4oJqBgFEvwb6yT2x6Bx8myW7nJkk8?= =?us-ascii?Q?sQ=3D=3D?= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: a713eccd-b231-4c60-6140-08dac144d656 X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB6117.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 04:51:02.8330 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e31cf5b5-ee69-4d5f-9c69-edeeda2458c0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fm9IzJ19AN2JlksQjkI+fmDV07v8CNsGlQRPQf8E/pO2DaDPCgtLVjBt3P0D2mfygGmm5iKKpmi5YpCcew433027KF1aS9zduRoN6Sw3G24= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR04MB5704 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Currently glibc uses in_time_t_range to detects time_t overflow, and if it occurs fallbacks to 64 bit syscall version. The function name is confusing because internally time_t might be either 32 bits or 64 bits (depending on __TIMESIZE). This patch refactors the in_time_t_range by replacing it with in_int32_t_range for the case to check if the 64 bit time_t syscall should be used. The in_time_t range is used to detect overflow of the syscall return value. --- include/time.h | 10 +++++++++- nptl/futex-internal.c | 4 ++-- sysdeps/unix/sysv/linux/clock_adjtime.c | 2 +- sysdeps/unix/sysv/linux/clock_nanosleep.c | 2 +- sysdeps/unix/sysv/linux/clock_settime.c | 2 +- sysdeps/unix/sysv/linux/mq_timedreceive.c | 2 +- sysdeps/unix/sysv/linux/mq_timedsend.c | 2 +- sysdeps/unix/sysv/linux/ppoll.c | 2 +- sysdeps/unix/sysv/linux/pselect.c | 2 +- sysdeps/unix/sysv/linux/recvmmsg.c | 2 +- sysdeps/unix/sysv/linux/select.c | 2 +- sysdeps/unix/sysv/linux/semtimedop.c | 2 +- sysdeps/unix/sysv/linux/setitimer.c | 4 ++-- sysdeps/unix/sysv/linux/setsockopt.c | 2 +- sysdeps/unix/sysv/linux/sigtimedwait.c | 2 +- sysdeps/unix/sysv/linux/timer_settime.c | 4 ++-- sysdeps/unix/sysv/linux/timerfd_settime.c | 4 ++-- sysdeps/unix/sysv/linux/utimensat.c | 4 ++-- 18 files changed, 31 insertions(+), 23 deletions(-) diff --git a/include/time.h b/include/time.h index 20abea69d4..f599eeed4e 100644 --- a/include/time.h +++ b/include/time.h @@ -347,12 +347,20 @@ libc_hidden_proto (__time64) /* Check whether T fits in int32_t, assume all usages are for sizeof(time_t) == 32. */ static inline bool -in_time_t_range (__time64_t t) +in_int32_t_range (__time64_t t) { int32_t s = t; return s == t; } +/* Check whether T fits in time_t. */ +static inline bool +in_time_t_range (__time64_t t) +{ + time_t s = t; + return s == t; +} + /* Convert a known valid struct timeval into a struct __timespec64. */ static inline struct __timespec64 valid_timeval_to_timespec64 (const struct timeval tv) diff --git a/nptl/futex-internal.c b/nptl/futex-internal.c index 7ec228e8fb..6b8ac2304d 100644 --- a/nptl/futex-internal.c +++ b/nptl/futex-internal.c @@ -87,7 +87,7 @@ __futex_abstimed_wait_common (unsigned int* futex_word, err = __futex_abstimed_wait_common64 (futex_word, expected, op, abstime, private, cancel); #else - bool need_time64 = abstime != NULL && !in_time_t_range (abstime->tv_sec); + bool need_time64 = abstime != NULL && !in_int32_t_range (abstime->tv_sec); if (need_time64) { err = __futex_abstimed_wait_common64 (futex_word, expected, op, abstime, @@ -162,7 +162,7 @@ __futex_lock_pi64 (int *futex_word, clockid_t clockid, # ifdef __ASSUME_TIME64_SYSCALLS err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op_pi, 0, abstime); # else - bool need_time64 = abstime != NULL && !in_time_t_range (abstime->tv_sec); + bool need_time64 = abstime != NULL && !in_int32_t_range (abstime->tv_sec); if (need_time64) err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op_pi, 0, abstime); else diff --git a/sysdeps/unix/sysv/linux/clock_adjtime.c b/sysdeps/unix/sysv/linux/clock_adjtime.c index 5ded82f506..63ea68c3af 100644 --- a/sysdeps/unix/sysv/linux/clock_adjtime.c +++ b/sysdeps/unix/sysv/linux/clock_adjtime.c @@ -35,7 +35,7 @@ __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) return r; if (tx64->modes & ADJ_SETOFFSET - && ! in_time_t_range (tx64->time.tv_sec)) + && ! in_int32_t_range (tx64->time.tv_sec)) { __set_errno (EOVERFLOW); return -1; diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index e610fd4e8d..9031060486 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -48,7 +48,7 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id, flags, req, rem); #else - if (!in_time_t_range (req->tv_sec)) + if (!in_int32_t_range (req->tv_sec)) { r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id, flags, req, rem); diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c index 2a32e2eb13..db9698ba0d 100644 --- a/sysdeps/unix/sysv/linux/clock_settime.c +++ b/sysdeps/unix/sysv/linux/clock_settime.c @@ -41,7 +41,7 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp) if (ret == 0 || errno != ENOSYS) return ret; - if (! in_time_t_range (tp->tv_sec)) + if (! in_int32_t_range (tp->tv_sec)) { __set_errno (EOVERFLOW); return -1; diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c index 5bf1e0a83b..6c719d4b70 100644 --- a/sysdeps/unix/sysv/linux/mq_timedreceive.c +++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c @@ -36,7 +36,7 @@ ___mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len msg_prio, abs_timeout); #else bool need_time64 = abs_timeout != NULL - && !in_time_t_range (abs_timeout->tv_sec); + && !in_int32_t_range (abs_timeout->tv_sec); if (need_time64) { int r = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, diff --git a/sysdeps/unix/sysv/linux/mq_timedsend.c b/sysdeps/unix/sysv/linux/mq_timedsend.c index 3ca5050976..eb8353feef 100644 --- a/sysdeps/unix/sysv/linux/mq_timedsend.c +++ b/sysdeps/unix/sysv/linux/mq_timedsend.c @@ -36,7 +36,7 @@ ___mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, msg_prio, abs_timeout); #else bool need_time64 = abs_timeout != NULL - && !in_time_t_range (abs_timeout->tv_sec); + && !in_int32_t_range (abs_timeout->tv_sec); if (need_time64) { int r = SYSCALL_CANCEL (mq_timedsend_time64, mqdes, msg_ptr, msg_len, diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c index 1105e29b00..6653e1bc55 100644 --- a/sysdeps/unix/sysv/linux/ppoll.c +++ b/sysdeps/unix/sysv/linux/ppoll.c @@ -43,7 +43,7 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout, __NSIG_BYTES); #else int ret; - bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec); + bool need_time64 = timeout != NULL && !in_int32_t_range (timeout->tv_sec); if (need_time64) { ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask, diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c index eba1c111f8..23fd0dfad6 100644 --- a/sysdeps/unix/sysv/linux/pselect.c +++ b/sysdeps/unix/sysv/linux/pselect.c @@ -56,7 +56,7 @@ __pselect64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, return pselect64_syscall (nfds, readfds, writefds, exceptfds, timeout, sigmask); #else - bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec); + bool need_time64 = timeout != NULL && !in_int32_t_range (timeout->tv_sec); if (need_time64) { int r = pselect64_syscall (nfds, readfds, writefds, exceptfds, timeout, diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index d9664d61c4..1ba5a4f25c 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -35,7 +35,7 @@ recvmmsg_syscall (int fd, struct mmsghdr *vmessages, unsigned int vlen, struct timespec ts32, *pts32 = NULL; if (timeout != NULL) { - if (! in_time_t_range (timeout->tv_sec)) + if (! in_int32_t_range (timeout->tv_sec)) { __set_errno (EINVAL); return -1; diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c index a3f0a2eba7..fd147dfdd4 100644 --- a/sysdeps/unix/sysv/linux/select.c +++ b/sysdeps/unix/sysv/linux/select.c @@ -72,7 +72,7 @@ __select64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, TIMESPEC_TO_TIMEVAL (timeout, pts64); return r; #else - bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec); + bool need_time64 = timeout != NULL && !in_int32_t_range (timeout->tv_sec); if (need_time64) { int r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c index 38a401bb6f..0cdc0fad4b 100644 --- a/sysdeps/unix/sysv/linux/semtimedop.c +++ b/sysdeps/unix/sysv/linux/semtimedop.c @@ -42,7 +42,7 @@ __semtimedop64 (int semid, struct sembuf *sops, size_t nsops, #ifdef __ASSUME_TIME64_SYSCALLS return semtimedop_syscall (semid, sops, nsops, timeout); #else - bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec); + bool need_time64 = timeout != NULL && !in_int32_t_range (timeout->tv_sec); if (need_time64) { int r = semtimedop_syscall (semid, sops, nsops, timeout); diff --git a/sysdeps/unix/sysv/linux/setitimer.c b/sysdeps/unix/sysv/linux/setitimer.c index 6d5183aa63..55e6003e0f 100644 --- a/sysdeps/unix/sysv/linux/setitimer.c +++ b/sysdeps/unix/sysv/linux/setitimer.c @@ -32,8 +32,8 @@ __setitimer64 (__itimer_which_t which, #else struct __itimerval32 new_value_32; - if (! in_time_t_range (new_value->it_interval.tv_sec) - || ! in_time_t_range (new_value->it_value.tv_sec)) + if (! in_int32_t_range (new_value->it_interval.tv_sec) + || ! in_int32_t_range (new_value->it_value.tv_sec)) { __set_errno (EOVERFLOW); return -1; diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c index 4292f411f3..6506ca03ab 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c +++ b/sysdeps/unix/sysv/linux/setsockopt.c @@ -54,7 +54,7 @@ setsockopt32 (int fd, int level, int optname, const void *optval, } struct __timeval64 *tv64 = (struct __timeval64 *) optval; - if (! in_time_t_range (tv64->tv_sec)) + if (! in_int32_t_range (tv64->tv_sec)) { __set_errno (EOVERFLOW); break; diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c index 069fa1d5e4..1993e3f85a 100644 --- a/sysdeps/unix/sysv/linux/sigtimedwait.c +++ b/sysdeps/unix/sysv/linux/sigtimedwait.c @@ -31,7 +31,7 @@ __sigtimedwait64 (const sigset_t *set, siginfo_t *info, result = SYSCALL_CANCEL (rt_sigtimedwait_time64, set, info, timeout, __NSIG_BYTES); #else - bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec); + bool need_time64 = timeout != NULL && !in_int32_t_range (timeout->tv_sec); if (need_time64) { result = SYSCALL_CANCEL (rt_sigtimedwait_time64, set, info, timeout, diff --git a/sysdeps/unix/sysv/linux/timer_settime.c b/sysdeps/unix/sysv/linux/timer_settime.c index 518fed9c59..056e0aff59 100644 --- a/sysdeps/unix/sysv/linux/timer_settime.c +++ b/sysdeps/unix/sysv/linux/timer_settime.c @@ -46,8 +46,8 @@ ___timer_settime64 (timer_t timerid, int flags, # endif struct itimerspec its32, oits32; - if (! in_time_t_range ((value->it_value).tv_sec) - || ! in_time_t_range ((value->it_interval).tv_sec)) + if (! in_int32_t_range ((value->it_value).tv_sec) + || ! in_int32_t_range ((value->it_interval).tv_sec)) { __set_errno (EOVERFLOW); return -1; diff --git a/sysdeps/unix/sysv/linux/timerfd_settime.c b/sysdeps/unix/sysv/linux/timerfd_settime.c index 59282bf1ad..c5f3f14c3b 100644 --- a/sysdeps/unix/sysv/linux/timerfd_settime.c +++ b/sysdeps/unix/sysv/linux/timerfd_settime.c @@ -33,8 +33,8 @@ __timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value, #ifdef __ASSUME_TIME64_SYSCALLS return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue); #else - bool need_time64 = !in_time_t_range (value->it_value.tv_sec) - || !in_time_t_range (value->it_interval.tv_sec); + bool need_time64 = !in_int32_t_range (value->it_value.tv_sec) + || !in_int32_t_range (value->it_interval.tv_sec); if (need_time64) { int r = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c index 5662ecc9aa..54a5e47618 100644 --- a/sysdeps/unix/sysv/linux/utimensat.c +++ b/sysdeps/unix/sysv/linux/utimensat.c @@ -41,9 +41,9 @@ __utimensat64_helper (int fd, const char *file, bool need_time64 = tsp64 != NULL && ((!TS_SPECIAL (tsp64[0]) - && !in_time_t_range (tsp64[0].tv_sec)) + && !in_int32_t_range (tsp64[0].tv_sec)) || (!TS_SPECIAL (tsp64[1]) - && !in_time_t_range (tsp64[1].tv_sec))); + && !in_int32_t_range (tsp64[1].tv_sec))); if (need_time64) { int r = INLINE_SYSCALL_CALL (utimensat_time64, fd, file, &tsp64[0], -- 2.30.2