From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id 902703835696 for ; Wed, 1 Jun 2022 17:00:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 902703835696 Received: by mail-oi1-x22e.google.com with SMTP id s188so3436161oie.4 for ; Wed, 01 Jun 2022 10:00:40 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2ljpz5zEt0HcGxfj8R2p0EM9IMW9Ip6+4D65WBT9KQI=; b=ZRTaoQiq1fQYuefY25Ao6L2GJeEvHEn1VIQvkEb/cmQR+O+FBXg5ztR1GtFcjHm+ZA CjPUmhimQDMo4iBCHtlR8Z7MgqmkPOd94BsLrwmEJ9MOacUUan1Y8R1+rQFM4Ng2De90 /l5vLJ7OrBv/SSHXfC8aWiwfPdkOJ9jUYyeO8gyW63r7OojiLoYMdQAw7G4cYY3h8npD Zg3LMUz9ikeBhMxII50o8Poh5nnnhEwZMSOuhAH8H2MJKVyM8JQ6H0LokurVIPNZONsP X9+9FNviNlhBHIGItYENT7L+O9gVFLmG8u7ATja81vV0Z501tkp6+RJEmEEdJuRXO6MB 0Evw== X-Gm-Message-State: AOAM533YwUDUgT5sjgNu+rIK9SgFVAy+rx3rdRc4r9DkoFnbcUntwtek UWQzHtbtDI+cv7Z+PCh2hZRC/d2UxnSYOg== X-Google-Smtp-Source: ABdhPJyFoGPi5Z/gQnaonWo7st+QqI+FoXZTFUZtuTAQR6IjKZPvafiyd1ubappPe6SL2FKvb9Erxg== X-Received: by 2002:a05:6808:302b:b0:2f9:eeef:f03 with SMTP id ay43-20020a056808302b00b002f9eeef0f03mr16169242oib.128.1654102839756; Wed, 01 Jun 2022 10:00:39 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:a183:7f80:9e50:177b]) by smtp.gmail.com with ESMTPSA id bh35-20020a056808182300b00325cda1ff95sm1257658oib.20.2022.06.01.10.00.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 10:00:39 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.34 7/8] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Date: Wed, 1 Jun 2022 14:00:27 -0300 Message-Id: <20220601170028.2638215-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220601170028.2638215-1-adhemerval.zanella@linaro.org> References: <20220601170028.2638215-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 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, T_SCC_BODY_TEXT_LINE 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 17:00:42 -0000 This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit c86631de6fa2fb5fa293810c66e53898537a4ddc) --- NEWS | 1 + catgets/open_catalog.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ad6de8304f..70e561659a 100644 --- a/NEWS +++ b/NEWS @@ -107,6 +107,7 @@ The following bugs are resolved with this release: [29208] libc: fpathconf(_PC_ASYNC_IO) is not y2038 aware [29209] libc: isfdtype is not y2038 aware [29210] network: ruserpass is not y2038 aware + [29211] libc: __open_catalog is not y2038 aware Version 2.34 diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 7f67cc0564..75703b2cad 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -40,7 +40,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, __nl_catd catalog) { int fd = -1; - struct stat64 st; + struct __stat64_t64 st; int swapping; size_t cnt; size_t max_offset; @@ -194,7 +194,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, return -1; } - if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) + if (__glibc_unlikely (__fstat64_time64 (fd, &st) < 0)) goto close_unlock_return; if (__builtin_expect (!S_ISREG (st.st_mode), 0) -- 2.34.1