From patchwork Wed Apr 27 18:48:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 53278 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 B06443857341 for ; Wed, 27 Apr 2022 18:48:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B06443857341 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1651085320; bh=aIWhDepLTTNHchDG3NRVEbeg5RIUu+ZKHx4TidcR0jw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=J1Nzr4GVM4eu09uUYoXh/IUkOYXIexVnhSVDHDS7s5IAeMLkiQ6UZE15sJ82pCKTL uvPds5x4AHUXEmQ7BqEvizoKZrVuj7LVzK3PZFVIEm1PVv5H6rHgjipGy7hts+Cl+R phJDcNvbF0SsMWSNjfxLeJwqnKXzk539shvXME48= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by sourceware.org (Postfix) with ESMTPS id 078DF385842B for ; Wed, 27 Apr 2022 18:48:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 078DF385842B Received: by mail-oo1-xc29.google.com with SMTP id c19-20020a4a3813000000b0035ea4a3b97eso208780ooa.12 for ; Wed, 27 Apr 2022 11:48:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=aIWhDepLTTNHchDG3NRVEbeg5RIUu+ZKHx4TidcR0jw=; b=7IqT872uDagoIrDrMJF6Z5/H8j7G9xmmaXavLeCJK6ndguiXw8y/OauOhqX5p+yVeT UI+z5GP7SbjDXrf1VUjRFYpGD7jZjZjllPEfAHLDjKSFtjzcSW06eXDjPfSNBkJcE4/B o0ZzTL+V+aXBdS065tgf5JSXzMFpaOuvghFH1BoMdX3DKbuLhfUhoB0L8kKFfYegGkb4 lDXhaVO3IapFAz4fq6cLovOAjlz1gmD5sDpCQzfLaGuBVcWSEzpH0Vj+zWvE7G1NwDNG APEuO//F/Nm8/BKyhGMstxaklfRMf4AKRbA6s8qgEUULkNF2Lh8yonnbzVKtd9DJSAD5 T8Ww== X-Gm-Message-State: AOAM5339b2aPeYimRvN5wOaY1DgB9yPNwRz0sUlP1Bs6L8uHVCFjiu3x m5ceKAgJFP7tdUuJ8/KoosKFiP4rJ8rPYw== X-Google-Smtp-Source: ABdhPJyAEVXmCTj85ExNcC2keicBF4ydh7PeLLiyUkbm5HucnroW1AI/HxaTkhf/po4eNiWd2tUUXg== X-Received: by 2002:a4a:6f0e:0:b0:35d:78b5:ec4c with SMTP id h14-20020a4a6f0e000000b0035d78b5ec4cmr10649318ooc.47.1651085297924; Wed, 27 Apr 2022 11:48:17 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:4214:b613:182d:cdde:5f86]) by smtp.gmail.com with ESMTPSA id i16-20020a056870d41000b000e686d1388esm1042729oag.40.2022.04.27.11.48.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 11:48:17 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] linux: Fix fchmodat with AT_SYMLINK_NOFOLLOW for 64 bit time_t (BZ#29097) Date: Wed, 27 Apr 2022 15:48:13 -0300 Message-Id: <20220427184813.3124798-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The AT_SYMLINK_NOFOLLOW emulation ues the default 32 bit stat internal calls, which fails with EOVERFLOW if the file constains timestamps beyond 2038. Checked on i686-linux-gnu. --- v2: Add missing io/tst-lchmod-time64.c. --- io/Makefile | 8 +++++--- io/tst-lchmod-time64.c | 2 ++ io/tst-lchmod.c | 22 +++++++++++++++++++++- sysdeps/unix/sysv/linux/fchmodat.c | 4 ++-- 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 io/tst-lchmod-time64.c diff --git a/io/Makefile b/io/Makefile index cf265dc9b9..b1710407d0 100644 --- a/io/Makefile +++ b/io/Makefile @@ -83,16 +83,17 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ tst-ftw-bz28126 tests-time64 := \ + tst-fcntl-time64 \ + tst-fts-time64 \ tst-futimens-time64 \ tst-futimes-time64\ - tst-fts-time64 \ + tst-futimesat-time64 \ + tst-lchmod-time64 \ tst-lutimes-time64 \ tst-stat-time64 \ - tst-futimesat-time64 \ tst-utime-time64 \ tst-utimensat-time64 \ tst-utimes-time64 \ - tst-fcntl-time64 \ # tests-time64 # Likewise for statx, but we do not need static linking here. @@ -136,6 +137,7 @@ CFLAGS-close.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-test-stat.c += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS-test-lfs.c += -D_LARGEFILE64_SOURCE +CFLAGS-tst-lchmod.c += -D_FILE_OFFSET_BITS=64 test-stat2-ARGS = Makefile . $(objpfx)test-stat2 diff --git a/io/tst-lchmod-time64.c b/io/tst-lchmod-time64.c new file mode 100644 index 0000000000..f2b7cc9d35 --- /dev/null +++ b/io/tst-lchmod-time64.c @@ -0,0 +1,2 @@ +#define CHECK_TIME64 +#include "tst-lchmod.c" diff --git a/io/tst-lchmod.c b/io/tst-lchmod.c index c644f565f6..c716edb9a9 100644 --- a/io/tst-lchmod.c +++ b/io/tst-lchmod.c @@ -66,10 +66,27 @@ select_path (bool do_relative_path, const char *full_path, const char *relative_ return full_path; } +static void +update_file_time_to_y2038 (const char *fname, int flags) +{ +#ifdef CHECK_TIME64 + /* Y2038 threshold plus 1 and 2 seconds. */ + const struct timespec ts[] = { { 0x80000001LL, 0}, { 0x80000002LL } }; + TEST_VERIFY_EXIT (utimensat (AT_FDCWD, fname, ts, flags) == 0); +#endif +} + static void test_1 (bool do_relative_path, int (*chmod_func) (int fd, const char *, mode_t, int)) { char *tempdir = support_create_temp_directory ("tst-lchmod-"); +#ifdef CHECK_TIME64 + if (!support_path_support_time64 (tempdir)) + { + puts ("info: test skipped, filesystem does not support 64 bit time_t"); + return; + } +#endif char *path_dangling = xasprintf ("%s/dangling", tempdir); char *path_file = xasprintf ("%s/file", tempdir); @@ -93,9 +110,12 @@ test_1 (bool do_relative_path, int (*chmod_func) (int fd, const char *, mode_t, xsymlink ("loop", path_loop); xsymlink ("target-does-not-exist", path_dangling); + update_file_time_to_y2038 (path_file, 0); + update_file_time_to_y2038 (path_to_file, AT_SYMLINK_NOFOLLOW); + /* Check that the modes do not collide with what we will use in the test. */ - struct stat64 st; + struct stat st; xstat (path_file, &st); TEST_VERIFY ((st.st_mode & 0777) != 1); xlstat (path_to_file, &st); diff --git a/sysdeps/unix/sysv/linux/fchmodat.c b/sysdeps/unix/sysv/linux/fchmodat.c index 7aa073bf3c..7aae02148a 100644 --- a/sysdeps/unix/sysv/linux/fchmodat.c +++ b/sysdeps/unix/sysv/linux/fchmodat.c @@ -48,8 +48,8 @@ fchmodat (int fd, const char *file, mode_t mode, int flag) /* Use fstatat because fstat does not work on O_PATH descriptors before Linux 3.6. */ - struct stat64 st; - if (__fstatat64 (pathfd, "", &st, AT_EMPTY_PATH) != 0) + struct __stat64_t64 st; + if (__fstatat64_time64 (pathfd, "", &st, AT_EMPTY_PATH) != 0) { __close_nocancel (pathfd); return -1;