From patchwork Wed Oct 14 20:37:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40721 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 B77E23857C55; Wed, 14 Oct 2020 20:37:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B77E23857C55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1602707836; bh=fi9oXeUNexG1PFKHkqH2nRAoylld8ZaPSO04npzypYE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Cay4vgSzUIp161VBci+kFBTVR5juaDHDf8FHX13WmE4O2bPPZ4xpVVfrgBfQsVANs FHw2otX0jLkfUXwNISQkInsPwsZK8lS6Rv9AmtEcP6ADMjcTFLn6wXpN173bS5rImI 8+P6XsFe4kYb5W5iS/sirCpJLryYrudIpVozxNWg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id CC6A53857C43 for ; Wed, 14 Oct 2020 20:37:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CC6A53857C43 Received: by mail-qv1-xf44.google.com with SMTP id f5so208429qvx.6 for ; Wed, 14 Oct 2020 13:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=fi9oXeUNexG1PFKHkqH2nRAoylld8ZaPSO04npzypYE=; b=cAYYnWZ+OF8eh4doKd2Qp77sPsalrKOV/5OqPhLL8I2ZjJyI436fSykIIZhd2D6563 arOfMSrGvvxHvDUJVt96Utqgg2mM5JPaxmf57my+vbDEVgdyEgNyaET3xcIRUGathlkq 8JC/JcYxWp545lBpSOmj9te3poQ1+jIQ7NKvpoltgmDLDN/AtYYV7jxBKQx5SHe/l6Ej OqcbiEQhPmwoawXAc5UDJyhF99oTIbQHVoVm1cm2fPlSdE4xODPIEKfpqHwQa7M7IbZI KZJXuZ0N6+iRRnQInjDxJzqeXdjniB+OjFnh5ccnBhYAyFjCeO0wIj37sKc0X/XUJBy/ PTFg== X-Gm-Message-State: AOAM533BFzwQZJpQHQRE5ZVkYpkFdLofPBkmDHMSVEtFZRzcuQx62Hg7 6pONwDKKGwv03qJEO9STTlOH7R6ovASWFg== X-Google-Smtp-Source: ABdhPJzIRTXBg9cGyyZuxUUozTKmIA0ltwYwRg1/JuDzMHd8gpR+6XUi3tzvu6xA51szXAW3T+mpGw== X-Received: by 2002:a0c:a4c5:: with SMTP id x63mr1161655qvx.58.1602707832860; Wed, 14 Oct 2020 13:37:12 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id d142sm341968qke.125.2020.10.14.13.37.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 13:37:12 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/3] linux: Use INTERNAL_SYSCALL on fstatat{64} Date: Wed, 14 Oct 2020 17:37:05 -0300 Message-Id: <20201014203707.2394289-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" Although not required by the standards, some code expects that a successful stat call should not set errno. However since aa03f722f3b99 'linux: Add {f}stat{at} y2038 support', stat implementation will first try a __NR_statx call and if it fails with ENOSYS then issue the required stat syscall. On 32-bit architecture running on kernel without __NR_statx support the first call will set the errno to ENOSYS, even when the following stat syscall does not fail. This patch fixes by using INTERNAL_SYSCALL and only setting the errno value when function returns. Checked on i686-linux-gnu, x86_64-linux-gnu, sparc64-linux-gnu, sparcv9-linux-gnu, powerpc64-linux-gnu, powerpc64le-linux-gnu, arm-linux-gnueabihf, and aarch64-linux-gnu. --- sysdeps/unix/sysv/linux/fstatat.c | 28 ++++++++++------ sysdeps/unix/sysv/linux/fstatat64.c | 33 ++++++++++--------- .../unix/sysv/linux/mips/mips64/kstat_cp.h | 8 ++--- .../unix/sysv/linux/sparc/sparc64/kstat_cp.h | 4 +-- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c index c7fcfaf277..78fad51961 100644 --- a/sysdeps/unix/sysv/linux/fstatat.c +++ b/sysdeps/unix/sysv/linux/fstatat.c @@ -26,22 +26,24 @@ int __fstatat (int fd, const char *file, struct stat *buf, int flag) { + int r; + # if STAT_IS_KERNEL_STAT /* New kABIs which uses generic pre 64-bit time Linux ABI, e.g. csky, nios2 */ - int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, buf, flag); - if (r == 0 && (buf->__st_ino_pad != 0 - || buf->__st_size_pad != 0 - || buf->__st_blocks_pad != 0)) + r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, buf, flag); + if (! INTERNAL_SYSCALL_ERROR_P (r) + && (buf->__st_ino_pad != 0 + || buf->__st_size_pad != 0 + || buf->__st_blocks_pad != 0)) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); - return r; # else # ifdef __NR_fstatat64 /* Old KABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, mips32, microblaze, s390, sh, powerpc, and sparc. */ struct stat64 st64; - int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); - if (r == 0) + r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); + if (! INTERNAL_SYSCALL_ERROR_P (r)) { if (! in_ino_t_range (st64.st_ino) || ! in_off_t_range (st64.st_size) @@ -67,15 +69,21 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag) buf->st_mtim.tv_nsec = st64.st_mtim.tv_nsec; buf->st_ctim.tv_sec = st64.st_ctim.tv_sec; buf->st_ctim.tv_nsec = st64.st_ctim.tv_nsec; + + return 0; } - return r; # else /* 64-bit kabi outlier, e.g. mips64 and mips64-n32. */ struct kernel_stat kst; - int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); - return r ?: __cp_kstat_stat (&kst, buf); + r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); + if (! INTERNAL_SYSCALL_ERROR_P (r)) + r = __cp_kstat_stat (&kst, buf); # endif /* __nr_fstatat64 */ # endif /* STAT_IS_KERNEL_STAT */ + + return INTERNAL_SYSCALL_ERROR_P (r) + ? INLINE_SYSCALL_ERROR_RETURN_VALUE (-r) + : 0; } weak_alias (__fstatat, fstatat) diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c index ae8fc101c5..f9b603ce5a 100644 --- a/sysdeps/unix/sysv/linux/fstatat64.c +++ b/sysdeps/unix/sysv/linux/fstatat64.c @@ -39,31 +39,32 @@ __fstatat64_time64 (int fd, const char *file, struct __stat64_t64 *buf, /* 32-bit kABI with default 64-bit time_t, e.g. arc, riscv32. Also 64-bit time_t support is done through statx syscall. */ struct statx tmp; - r = INLINE_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag, - STATX_BASIC_STATS, &tmp); - if (r == 0 || errno != ENOSYS) + r = INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag, + STATX_BASIC_STATS, &tmp); + if (! INTERNAL_SYSCALL_ERROR_P (r)) { - if (r == 0) - __cp_stat64_t64_statx (buf, &tmp); + __cp_stat64_t64_statx (buf, &tmp); return r; } + if (-r != ENOSYS) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); #endif #if XSTAT_IS_XSTAT64 # ifdef __NR_newfstatat /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and x86_64. */ - r = INLINE_SYSCALL_CALL (newfstatat, fd, file, buf, flag); + r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, buf, flag); # elif defined __NR_fstatat64 # if STAT64_IS_KERNEL_STAT64 /* 64-bit kABI outlier, e.g. alpha */ - r = INLINE_SYSCALL_CALL (fstatat64, fd, file, buf, flag); + r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, buf, flag); # else /* 64-bit kABI outlier, e.g. sparc64. */ struct kernel_stat64 kst64; - r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &kst64, flag); - if (r == 0) - r = __cp_stat64_kstat64 (buf, &kst64); + r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &kst64, flag); + if (! INTERNAL_SYSCALL_ERROR_P (r)) + __cp_stat64_kstat64 (buf, &kst64); # endif # endif #else @@ -72,8 +73,8 @@ __fstatat64_time64 (int fd, const char *file, struct __stat64_t64 *buf, e.g. arm, csky, i386, hppa, m68k, microblaze, nios2, sh, powerpc32, and sparc32. */ struct stat64 st64; - r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); - if (r == 0) + r = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); + if (! INTERNAL_SYSCALL_ERROR_P (r)) { /* Clear both pad and reserved fields. */ memset (buf, 0, sizeof (*buf)); @@ -95,13 +96,15 @@ __fstatat64_time64 (int fd, const char *file, struct __stat64_t64 *buf, # else /* 64-bit kabi outlier, e.g. mips64 and mips64-n32. */ struct kernel_stat kst; - r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); + r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); if (r == 0) - r = __cp_kstat_stat64_t64 (&kst, buf); + __cp_kstat_stat64_t64 (&kst, buf); # endif #endif - return r; + return INTERNAL_SYSCALL_ERROR_P (r) + ? INLINE_SYSCALL_ERROR_RETURN_VALUE (-r) + : 0; } #if __TIMESIZE != 64 hidden_def (__fstatat64_time64) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/kstat_cp.h b/sysdeps/unix/sysv/linux/mips/mips64/kstat_cp.h index 1805d4b85f..71fe39fdd0 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/kstat_cp.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/kstat_cp.h @@ -19,13 +19,13 @@ #include #include -static inline int +static inline long int __cp_kstat_stat (const struct kernel_stat *kst, struct stat *st) { if (! in_ino_t_range (kst->st_ino) || ! in_off_t_range (kst->st_size) || ! in_blkcnt_t_range (kst->st_blocks)) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); + return -EOVERFLOW; st->st_dev = kst->st_dev; memset (&st->st_pad1, 0, sizeof (st->st_pad1)); @@ -51,7 +51,7 @@ __cp_kstat_stat (const struct kernel_stat *kst, struct stat *st) return 0; } -static inline int +static inline void __cp_kstat_stat64_t64 (const struct kernel_stat *kst, struct __stat64_t64 *st) { st->st_dev = kst->st_dev; @@ -70,6 +70,4 @@ __cp_kstat_stat64_t64 (const struct kernel_stat *kst, struct __stat64_t64 *st) st->st_mtim.tv_nsec = kst->st_mtime_nsec; st->st_ctim.tv_sec = kst->st_ctime_sec; st->st_ctim.tv_nsec = kst->st_ctime_nsec; - - return 0; } diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kstat_cp.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kstat_cp.h index 0599b6a49e..d3f2841ade 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kstat_cp.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kstat_cp.h @@ -18,7 +18,7 @@ #include -static inline int +static inline void __cp_stat64_kstat64 (struct stat64 *st64, const struct kernel_stat64 *kst64) { st64->st_dev = kst64->st_dev; @@ -41,6 +41,4 @@ __cp_stat64_kstat64 (struct stat64 *st64, const struct kernel_stat64 *kst64) st64->st_ctim.tv_nsec = kst64->st_ctime_nsec; st64->__glibc_reserved4 = 0; st64->__glibc_reserved5 = 0; - - return 0; }