From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by sourceware.org (Postfix) with ESMTPS id 0863038708EF for ; Mon, 28 Dec 2020 13:59:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0863038708EF Received: by mail-qk1-x731.google.com with SMTP id 143so8778824qke.10 for ; Mon, 28 Dec 2020 05:59:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LmQg2lOefaynJUHiCfMOninl/m1Oi/ewIzM+z4j8Rso=; b=K1y1F/asShmTpEjZkFl0ykaEzZXoRRMwNLEWHEvzRGoYa1qGQUkNx/HSpQILaxVqru RlXFvqFZDpeKluUDwiNPZ9iSDg0VwwDV2vjIEYbj49fJjn/NHwZ7rje+Pvg3BbLuojz5 RGy02QwQ73KVl92OX4aCww/6afG3SecqxDC6BVjHw8Ss80UZx7NB8sL5RyZ/5AA/zrdA TRBo7Xg/9bOWAQnlgOSj+1oF+iXqdMgtYwRyUeqi0w8Em7snP5hybtj6TahlPyXuxCYK Abe34H3qJ2idXpqVByIYNTU3s2eT2mPh2XB6O81cXblUSCwv/tV6yO8gobOPtUave3Jl bP+g== X-Gm-Message-State: AOAM531tCOYnz7AIk1PWIC4HoQwcHtAypqxXbqtu/r9H0mgSXx5Pb33r RAdLit/PrBp3XHP5HDNX3gPVwRm7oX4BZA== X-Google-Smtp-Source: ABdhPJzLzxfLKRFtEs6HqqrqhDQD0uIvpxNlLdfDV40dOMPwxOM+3Y/nu0p0OUG2max13P4YhZD6LA== X-Received: by 2002:a37:9d0e:: with SMTP id g14mr43952432qke.125.1609163998461; Mon, 28 Dec 2020 05:59:58 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id i17sm24243744qtg.77.2020.12.28.05.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 05:59:58 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Paul Eggert Cc: bug-gnulib@gnu.org Subject: [PATCH v2 6/6] stdlib: Assume FACCESSAT_NEVER_EOVERFLOWS on realpath Date: Mon, 28 Dec 2020 10:59:44 -0300 Message-Id: <20201228135944.1018303-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201228135944.1018303-1-adhemerval.zanella@linaro.org> References: <20201228135944.1018303-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.7 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-List-Received-Date: Mon, 28 Dec 2020 14:00:00 -0000 The faccessat (..., AT_EACCESS) on Linux fallback will either use __NR_faccessat for __libc_enable_secure or LFS fstatat call. Neither fallbacks returns EOVERFLOW in failure case. Checked on x86_64-linux-gnu. --- stdlib/canonicalize.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 69f978da78..5aac8d457c 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -44,15 +44,10 @@ #ifdef _LIBC # include -# include -# ifdef __ASSUME_FACCESSAT2 -# define FACCESSAT_NEVER_EOVERFLOWS __ASSUME_FACCESSAT2 -# else -# define FACCESSAT_NEVER_EOVERFLOWS true -# endif # define GCC_LINT 1 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) # define FUNC_REALPATH_WORKS 1 +# define FACCESSAT_NEVER_EOVERFLOWS true #else # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath @@ -82,7 +77,7 @@ # define __pathconf pathconf # define __rawmemchr rawmemchr # define __readlink readlink -# define __stat stat +# define FACCESSAT_NEVER_EOVERFLOWS false #endif /* Suppress bogus GCC -Wmaybe-uninitialized warnings. */ @@ -95,9 +90,6 @@ #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT # define DOUBLE_SLASH_IS_DISTINCT_ROOT false #endif -#ifndef FACCESSAT_NEVER_EOVERFLOWS -# define FACCESSAT_NEVER_EOVERFLOWS false -#endif #if !FUNC_REALPATH_WORKS || defined _LIBC -- 2.25.1