From patchwork Thu Nov 20 12:14:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 124826 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 6812D3857356 for ; Thu, 20 Nov 2025 12:15:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6812D3857356 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=hZv4Wsnm; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=izgSdh9p; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=EsRJi6pk; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=8Av/TmWT X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 1AFBD3858C24 for ; Thu, 20 Nov 2025 12:14:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AFBD3858C24 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1AFBD3858C24 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763640875; cv=none; b=PUu4EsXuqAWsOElGjj3GJ5tRLNuLi1CLhM/1lnpemVizyMk9BnDOcjCmQAMlBVZWu8GUopSbpwf7WLc3qeCNemeaIFyoIKaqOB1aPEJji1JZNDRKDjIu5zW0SM3jWDhiNG/gxVS4YF2FBIzaCsgeRDEdan61nVbGoK3czpuHyjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763640875; c=relaxed/simple; bh=7PKRuawJnIPR/wBKGurgIwU3APAVZ8X2MUzmjMOGg8U=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=hRDhc7DvDkLKVApCy0F81x4YwuTIu2U7q/fZUaGe7B+b9vnf6Z+DMQYlCbuomvyMZbCRcjDtm/yGdpalziDuqthpUT/Tj7lxWUk/kTZrqfXEgIVu+YRpjqCbkVVI52agNqX8GG83sH3I7ll5WasgBWImnStHj3TTDZbt6INVvMU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AFBD3858C24 Received: from hawking.nue2.suse.org (unknown [IPv6:2a07:de40:a101:3:92b1:1cff:fe69:ddc]) by smtp-out2.suse.de (Postfix) with ESMTP id BC5ED209FC for ; Thu, 20 Nov 2025 12:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763640874; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=jcugmjSTdW9CDtyUqJLmzM0MJFv1TDDhb7irK2JNyOo=; b=hZv4WsnmQgF7DAsLK2y9nQfpAMf5KKstxIA49p6sd1M6vvFjwSXI6yd/SthIq1Ak3joLUA aJ7TD5ob4k+gOcut4AWLov6O4GQAsWWqYioqMRLLh3DSf4JAV1OUZdm4CScHzwmno73g35 WDRCyDKD7INbIBLMPXBExUBmyHuy74w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763640874; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=jcugmjSTdW9CDtyUqJLmzM0MJFv1TDDhb7irK2JNyOo=; b=izgSdh9pW5lzjdE9HOFyQcztGgygVmTwTO6aB1lfzjIGBfNFmaKY/guF+SuCkUoVEtzEA/ kPFlwb1dRwyu8JBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=EsRJi6pk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="8Av/TmWT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763640873; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=jcugmjSTdW9CDtyUqJLmzM0MJFv1TDDhb7irK2JNyOo=; b=EsRJi6pkIxxuutchLlAoMCOnWs3NUvC1UZupylFguCgUVkZ/KbPHXxFzeEstw2TNc+PyiI ArYa2rmSBgMpa4KvzxJrJESg7Q4eDAEkPAwFkTGCr2DIud8jDAAL05zwcu3r84xm4Bm3rk 9jyUHBHDITs1f27QSEGQGckguvAgA5Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763640873; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=jcugmjSTdW9CDtyUqJLmzM0MJFv1TDDhb7irK2JNyOo=; b=8Av/TmWT+VzvRR46mMOUx/8JlCNM8DoQpsp6I0wUgv5g5bKXAqtlpPrYq/gp91BZXcAScw d+N7VS8OG+7HyCBw== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id A95E74AADB6; Thu, 20 Nov 2025 13:14:33 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Use __fstat64_time64 in __fts64_children_time64 (bug 33653) Date: Thu, 20 Nov 2025 13:14:33 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [15.29 / 50.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM_LONG(3.50)[1.000]; BAYES_HAM(-3.00)[100.00%]; NEURAL_SPAM_SHORT(3.00)[0.999]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.nue2.suse.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.nue2.suse.org]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MX_GOOD(-0.01)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:a101:3:92b1:1cff:fe69:ddc:from]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email] X-Spamd-Bar: +++++++++++++++ X-Rspamd-Queue-Id: BC5ED209FC X-Rspamd-Action: add header X-Spam-Score: 15.29 X-Spam: Yes X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Make sure that fts_safe_changedir can handle a directory with a time stamp after y2038. Reviewed-by: Adhemerval Zanella --- io/Makefile | 1 + io/fts.c | 5 +++-- io/fts64-time64.c | 1 + io/fts64.c | 1 + io/tst-fts-time64-y2038.c | 3 +++ io/tst-fts.c | 35 ++++++++++++++++++++++++++++++++++- 6 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 io/tst-fts-time64-y2038.c diff --git a/io/Makefile b/io/Makefile index 435f5a994f..269a3151a2 100644 --- a/io/Makefile +++ b/io/Makefile @@ -235,6 +235,7 @@ tests := \ tests-time64 := \ tst-fcntl-time64 \ tst-fts-time64 \ + tst-fts-time64-y2038 \ tst-futimens-time64 \ tst-futimes-time64\ tst-futimesat-time64 \ diff --git a/io/fts.c b/io/fts.c index d03b059177..674a98530d 100644 --- a/io/fts.c +++ b/io/fts.c @@ -85,6 +85,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; # define STRUCT_STAT stat # define STAT __stat # define LSTAT __lstat +# define FSTAT __fstat #endif static FTSENTRY *fts_alloc (FTSOBJ *, const char *, size_t); @@ -1111,14 +1112,14 @@ static int fts_safe_changedir (FTSOBJ *sp, FTSENTRY *p, int fd, const char *path) { int ret, oerrno, newfd; - struct stat64 sb; + struct STRUCT_STAT sb; newfd = fd; if (ISSET(FTS_NOCHDIR)) return (0); if (fd < 0 && (newfd = __open(path, O_RDONLY, 0)) < 0) return (-1); - if (__fstat64(newfd, &sb)) { + if (FSTAT (newfd, &sb)) { ret = -1; goto bail; } diff --git a/io/fts64-time64.c b/io/fts64-time64.c index cd36125d7d..f8b7b590a0 100644 --- a/io/fts64-time64.c +++ b/io/fts64-time64.c @@ -30,6 +30,7 @@ # define STRUCT_STAT __stat64_t64 # define STAT __stat64_time64 # define LSTAT __lstat64_time64 +# define FSTAT __fstat64_time64 # include "fts.c" #endif diff --git a/io/fts64.c b/io/fts64.c index 41c079b664..cf67cc19f7 100644 --- a/io/fts64.c +++ b/io/fts64.c @@ -27,5 +27,6 @@ #define STRUCT_STAT stat64 #define STAT __stat64 #define LSTAT __lstat64 +#define FSTAT __fstat64 #include "fts.c" diff --git a/io/tst-fts-time64-y2038.c b/io/tst-fts-time64-y2038.c new file mode 100644 index 0000000000..bddf259b0c --- /dev/null +++ b/io/tst-fts-time64-y2038.c @@ -0,0 +1,3 @@ +/* Test for bug 33653 in fts_safe_changedir. */ +#define TST_FTS_Y2038 +#include "tst-fts.c" diff --git a/io/tst-fts.c b/io/tst-fts.c index d97aaef431..c472c1b4cc 100644 --- a/io/tst-fts.c +++ b/io/tst-fts.c @@ -26,6 +26,7 @@ #include #include #include +#include static void prepare (void); static int do_test (void); @@ -54,6 +55,28 @@ make_dir (const char *dirname) add_temp_file (name); } +#ifdef TST_FTS_Y2038 +static void +set_time_y2038 (const char *dirname) +{ + char *name; + if (asprintf (&name, "%s/%s", fts_test_dir, dirname) < 0) + { + puts ("out of memory"); + exit (1); + } + + struct utimbuf ut = { 0x100000000, 0x100000000 }; + if (utime (name, &ut) < 0) + { + printf ("cannot set time on dir \"%s\": %m\n", name); + exit (1); + } + + free (name); +} +#endif + static void make_file (const char *filename) { @@ -108,6 +131,10 @@ prepare (void) make_file ("bbb/1234"); make_file ("bbb/5678"); make_file ("bbb/90ab"); + +#ifdef TST_FTS_Y2038 + set_time_y2038 ("bbb"); +#endif } /* Largest name wins, otherwise strcmp. */ @@ -160,7 +187,13 @@ do_test (void) { char *paths[2] = { fts_test_dir, NULL }; FTS *fts; - fts = fts_open (paths, FTS_LOGICAL, &compare_ents); + int flags = 0; + /* FTS_LOGICAL implies FTS_NOCHDIR, thus when testing for bug 33653, + don't use FTS_LOGICAL. */ +#ifndef TST_FTS_Y2038 + flags |= FTS_LOGICAL; +#endif + fts = fts_open (paths, flags, &compare_ents); if (fts == NULL) { printf ("FAIL: fts_open: %m\n");