From patchwork Fri Oct 28 20:54:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 59604 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 1FA033858427 for ; Fri, 28 Oct 2022 20:56:04 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id D11913858D39 for ; Fri, 28 Oct 2022 20:54:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D11913858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Content-Type:From:Reply-To:Subject:Content-ID: Content-Description:In-Reply-To:References:X-Debbugs-Cc; bh=BWGhpcmqKikf3QKO1ow4dveEhxCjyXgqrT3jyH59jtI=; b=iTPGlPPplVs1qvWXs5eSEauihh Uvu7z6AGTGCcDysbOGvO1S0NUjPvh199spGmZuDXGzT7uX1Di3Yn88UYcFQNAalk/Y34mtCe21ebC sRcgeJC5ldL1gMJ0KptuijBndfyjUAqVjksPUHsr20fauCUpjZrtWEi3vtVXWP0XUOKDLqy/fsxpT lixcPKYBZ0t05IJkxZKWdUXDNuNznD+e79W9dBeAg8rYDMMpqccMM7oBrPMUxrHkUOdzcxagm28Pu aQwmrHxaQnYBXlHUkxCRw5JNa9KUVkWLPGyhKbR0aAPyKW2rEIhQVK+yNabeajbPdpUcdeHzzabkJ Y+koTOSQ==; Received: from [2a01:e34:ec5d:a741:8a4c:7c4e:dc4c:1787] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ooWNL-00H6PT-Ov; Fri, 28 Oct 2022 22:54:47 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.96) (envelope-from ) id 1ooWNL-004Ztn-0v; Fri, 28 Oct 2022 22:54:47 +0200 From: Aurelien Jarno To: libc-alpha@sourceware.org Subject: [PATCH] linux: Fix fstatat with !XSTAT_IS_XSTAT64 and __TIMESIZE=64 (BZ #29730) Date: Fri, 28 Oct 2022 22:54:40 +0200 Message-Id: <20221028205440.1091298-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_NONE, 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 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: , Cc: Aurelien Jarno Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Commit 6e8a0aac2f883 ("time: Fix overflow itimer tests on 32-bit systems") changed in_time_t_range to assume a 32-bit time_t. Therefore stop calling it from __fstatat for systems with 64-bit time_t. Resolves: BZ #29730 --- sysdeps/unix/sysv/linux/fstatat.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c index 055fb4762e..afe93b6cf4 100644 --- a/sysdeps/unix/sysv/linux/fstatat.c +++ b/sysdeps/unix/sysv/linux/fstatat.c @@ -33,9 +33,13 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag) if (! in_ino_t_range (st64.st_ino) || ! in_off_t_range (st64.st_size) || ! in_blkcnt_t_range (st64.st_blocks) +/* in_time_t_range assumes that all usages are for sizeof(time_t) == 32. */ +# if __TIMESIZE != 64 || ! in_time_t_range (st64.st_atim.tv_sec) || ! in_time_t_range (st64.st_mtim.tv_sec) - || ! in_time_t_range (st64.st_ctim.tv_sec)) + || ! in_time_t_range (st64.st_ctim.tv_sec) +# endif + ) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); /* Clear internal pad and reserved fields. */