From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2126.outbound.protection.outlook.com [40.107.215.126]) by sourceware.org (Postfix) with ESMTPS id BCFCE3858404 for ; Fri, 4 Nov 2022 01:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BCFCE3858404 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=APUrArCKPTs6zdHQnzCxCGrSi9MPCF+JiFhDrGEX4oZlafMmM4g3Z3AXOE5/qn/cCAUiVOpIdNikmP2ih8AyIck2ADOMcF+0MaIN8xYUYwxyHCno9oI6mtYHNkOJNZYPWrl6b8kB/BYU01wnigpj3yyygX/OdSGgyHxr4uq8viXythIGn/JUrK8NTH7llpAgnZ4CQWhPuptdyh9wVqv2XJqRUE8DA7zn1om1OvGDzg3GzaEFSkZWeToyXPQWbe1hXfeAlNyuahvqcnia7tt8yqnvjaPZcB4AdaArYXNMFG1bhERumB8UhBs+lVzMH8bBDzt+CdEVdpihCk8tUGVing== 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=dyIQv7ej6H/s5WSmLND5Ih8CgmF/IYLygqSJ996FnpM=; b=VkQwgzvv+6niv38nMWONzft2nd6kHYKaZOzg7Ky/s/uQsh89aRZNS5ofu8ShHCIFa7vDdnhmR13y15a4arOkYm5EYRmiMPZggTe4Af3BoZBnLjmq2PFR6P3p73m73Ig+CkXo0UulYYn7rOsoqri7cLQl4FyrLVIiFCxu1zmc00Yepmony2f/w0qIZ69+AvwGKoXl8ftS+gTL+4FqBO7SwS2QNCOHvbiPirEm0kRuS2YI+NuTmI19BiLAklcaUW9agFV2hRDTqxsEAchWdB8FK10jNjrbYghIB92oI8KZIogK3SEZRS43m9GdNgdh+Im04vwFulFMk1fNXeZtaBHWOQ== 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=dyIQv7ej6H/s5WSmLND5Ih8CgmF/IYLygqSJ996FnpM=; b=UDFMosIACnaX6UWtWdiVZCrpIPSb5yw2LO+kWOiGdtaCNS7wPG1AKxT7ADhv3yC3djJVlhXBXaT38gnwGaMfwfPk9Hp3UZooF4rmHp7wK9LyqZOGg7AhBs65Ocfa6EWy0YjPsZukKFwO5D+HnQxRl5Nhb+kmAlmzYKB9GE3KOq8= 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 TYZPR04MB4509.apcprd04.prod.outlook.com (2603:1096:400:58::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Fri, 4 Nov 2022 01:48:28 +0000 Received: from TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::8f19:4247:369b:b64f]) by TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::8f19:4247:369b:b64f%8]) with mapi id 15.20.5791.022; Fri, 4 Nov 2022 01:48:28 +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 v2] Use in_int32_t_range to check need 64bit syscall Date: Fri, 4 Nov 2022 09:47:57 +0800 Message-Id: <20221104014757.1544793-1-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCP286CA0060.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::15) To TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR04MB6117:EE_|TYZPR04MB4509:EE_ X-MS-Office365-Filtering-Correlation-Id: d3c15ab2-81ae-43eb-077f-08dabe06ab5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yS9LweysP1upsjgOOTi++U5nD7mXtODIy5GTYTEDfNC11MrO6L0pevsveLIFxjdrCC1oIwO+5R5sSRBk8NdKBhiyUv/TG6IvxnDmzC9GjqUgn6Veh6SmYw6o3QXsu5FXzwByHFASNekq6ZnINlrcrWtltEAC2v9GJZyzZVb5zdSLO/4hVTGN2xxWfqvfLaE5aOpd84VzThoriXJMA8H8b7TlAjfAkfhVRUWGJz/u/UpcNonsqdXuf9sI5LR85uhdDhUDJsk1R4aLH6nUiIT6ZoybnxETB448Q3y430+79pqqaXN9e3aWAR4yq4+CgrY3Zf9PcsRJ4iDMcKV7ZoWGG2j2oKN8iGtyQIwko9BWpu7yjG/31WvMQLtOZiNwCqF1l2zuSGB/tdflS0PLIJ4C+59pjWZTKkhmrWJ+y55PIuNDCVvGPt9vRPcpFx42Zzad0UcWh0Qpc/j2rZWQk5q0jvY7PACZpp0fnrgh5yURt4eb7krRtbhv2ikirZKX4wUODfrqu3S5bxUAsBMHadwL5aEvG7V721wKpJh3/2fw9hleoDboiQqBVe5fsmxb4+xovhgw3XjzoqpexGsg8T0XetRiRpLAq2ZCBA/CotIf3ElbAZNvM37TBXibf0fH52yyRfAxIa4aB0fLqyzQK1TDTxUp1XK9hFIafcBsu6vvHT6kNK5a4+up3Mssaw+HExhhB59Ths92V8L+ohgsyPGv+eKt6Chh/BFdHeZIGQRBozoOTWBH2gmE3QPVAFMOEQRQyrIE/8CTHR19zwrAjMM6suv97tmMe/M3BdGt3T8Ui2w= 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)(346002)(39830400003)(366004)(136003)(376002)(396003)(451199015)(30864003)(43170500006)(6486002)(6666004)(4326008)(8676002)(66476007)(66946007)(66556008)(186003)(2616005)(1076003)(5660300002)(478600001)(107886003)(38350700002)(316002)(41300700001)(38100700002)(2906002)(6916009)(83380400001)(36756003)(52116002)(6506007)(8936002)(86362001)(26005)(6512007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fJcVqWAOpEunB1DfmXIA09n2d0diwffoXngoO1JAFBcF7xvmhmyd4ryy2xvg?= =?us-ascii?Q?2AbWlC2UU/aAQDHtKsuR8NO/CNAXDhWOPhbpCyddSN99LNmwrO5+a8jOe2Rq?= =?us-ascii?Q?q6bLEBRVQ3zuv3qO/nwDP9nPp2UDBVMsClrYjO120RjEowHmXuOuC/u9JoPv?= =?us-ascii?Q?FrDJ8RpSFVfCNO7DiXOjDh3iooBp/f6oZ5kj2YdPRVj5gU1BbgoO0Za2TOBP?= =?us-ascii?Q?b2Svy5nmzKqmShlBjOatbCauejSGMsPn2PBty7PQh6KX5O412fN0NJCM3czH?= =?us-ascii?Q?gJTicJI34toqzFushR7nOk0qYl66KXmSUjS3rdrrsJXMd1uih42ASC6iyEnu?= =?us-ascii?Q?n8osBTyovLGXe12p1E33qFzonViHWGzK3ghAkUuyzU6xLq5DMudaDBhWC0zA?= =?us-ascii?Q?2u7bBCtxmN5BmWKj4yHWlc9+/24/nCyKcsS63ufT02Yk2mCblt1/VEqsQ+4l?= =?us-ascii?Q?m3QPap38VbBIUJzPCL3GS7eNN1FVIliwoob6NvtRi6KTjNyv3nHY2nfS7FBb?= =?us-ascii?Q?VemvbOYUSUdFSjFbsxWbdv9hqi9XlmKTrkrJZCnnZeS9aUkT5INQQpt4it/3?= =?us-ascii?Q?v/hACpdRIARmrjZkaHD5aMYtvYvd+OjPmfeFnVZhhMO6ddjJCnMT5LvSYn97?= =?us-ascii?Q?S92jo17JAICXJq4CDJoa740lwtP/okI8zF7CyXiOcu+pn79ONqmPDw93FBU1?= =?us-ascii?Q?FNRB9K+P2oXLnZqpLEW4mR8Vt88jaWAZo77Rh+7BP5Upc3gHV8DvaAjjnqjM?= =?us-ascii?Q?53Ehk9j5WXf8IQKPMLzTmz8h6ISAcik4g+r55+B4tTHoUwCP6zWLE4v8RoI0?= =?us-ascii?Q?0po5rAQpPb/84wAzoVRVwamjrouvA1Rp7R9PJnZKdnQtWVKcP+a1smzBBtCN?= =?us-ascii?Q?u1nlGATrsAyLtmiAQp2N3WuFc8AqZy2LFrWjvadN3fdUbGBqK5LYJ44q+Oxv?= =?us-ascii?Q?d996J9DZV4bz2yiYgp5VfjDYICU3xIXxXzKvaAFHWtq3Ow8mOylRH6jdz9NM?= =?us-ascii?Q?C74XIP5ZAmicTkKt4TRERnh6fjY+r1lw1PFFXwHQ9mElhpxV6S6urA0Sj6Ga?= =?us-ascii?Q?gO0aCViffrrA6bomMdj2bTS2ZMYO0UZFGjIiR3HOG7JRld1oXE1hhM6SuYw6?= =?us-ascii?Q?dNCjaRGAResOaNryf/P4N6ttsyJbDfs/P4rujI4W2bKqANpNfU15xtMJJj9r?= =?us-ascii?Q?Ug0/Ayhnt5jYDaHMr3JYSTUS4ckijFJyz86AEdzW3gw6J+8MeHN4TjKk9U9j?= =?us-ascii?Q?2lVUMoO+tfzU0TOTIUqdGELaLExuAY3INKeK8jJLNCdo5G3Cr6YM4INh4x28?= =?us-ascii?Q?YPp5+vgYab0yLYu5+YL/RZyEVEQTehouafiolUtHkCpFDtHZ1fmhdJoy+/GN?= =?us-ascii?Q?U6X0dcUjrFPa0E5/YCDsxwjuHMHTQQRg7HbY++9Q66fKLUpjq4ZwBzhRof3l?= =?us-ascii?Q?hDG03yTSjNCvyQ9JjrhgktKshjq3jkLQLpFF9Nx6YpVLkA3bMPW11kjM8MkR?= =?us-ascii?Q?ZLcbn69R6uIiIWN+P4Tqoh2MDB0pr6qSjrfkmtYLf5l8/t9ombmN3qkKhqJH?= =?us-ascii?Q?Cczd9ghTttstvYRc0Iu3zPQoyHoEJAH1T7byKpgTuzUKuVItYOxfA1/pgKXE?= =?us-ascii?Q?FQ=3D=3D?= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3c15ab2-81ae-43eb-077f-08dabe06ab5b X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB6117.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2022 01:48:28.2327 (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: v3ANu6Ace3F6N4JCKhR7Ft45v+5pcsA6vdEViotNZOY3AmKcVLfLrzzrHDRkez3j7gIvEyKCPEYnInYONSieL+7dfZxnpRkCB7rJ2Uk2VXA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR04MB4509 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: The current version, we use in_time_t_range to detect overflow of a time. Whenever overflow we try to use 64bit version syscall. While the function name is quite confused. So let's use a new function called in_int32_t_range to do so. We still keep in_time_t_range, and use it to detect overflow of the return value from syscalls. --- 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