From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by sourceware.org (Postfix) with ESMTPS id C69F83856DD4 for ; Wed, 1 Jun 2022 17:40:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C69F83856DD4 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-f314077115so3677913fac.1 for ; Wed, 01 Jun 2022 10:40:28 -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=DJHEcBHDR8ztKihKNv5a5p8UchM/trSdgw2U9mZjM0s=; b=I61SMSI/z5kZHTo9w8j3hVSVOYzEwdJFGZ/NUimvAGmNI3Mw/5ADXCfglyseDmHudp wOwN2WRdeUuPZYi/oK+RfMf/OMQwbum6xpmy8aofWWpKKZdO5qHagnKdaPrDG2XyyT9C ME4VjCvg4Jkh3s61p0L46TuMrr6Wsmw814HEV02dRhG5IP4U1xOqA5fj/4A8Mb9Gn0KX CVWaHtblsLyDjQl11O1Z4ciePyDvQIIEqi4TCEmTHYXHc+mMEBkrAZrM89bcFMP1Vxqw liFrz2avFM1UcTz+VKMizOotBCJDpIPk6Oa6/Bnu6PZZpyEZ8trB3Jht9E61TlXx2nk5 kW3A== X-Gm-Message-State: AOAM530r3ubY1VuOx/UppHgwKzBHkwv2aIpGvopagNh4tTZRjXpXlHso XODdHWgmcmL4EDWXI78LzP9DdkJIDGytaQ== X-Google-Smtp-Source: ABdhPJxtP6MQADfbskcKebKcdaGN2QvKHgXmEOVs4SDHZM+DUEH95nSlLYgT8B4rhay/aYNkrvEfFQ== X-Received: by 2002:a05:6870:6191:b0:f2:dbca:cba with SMTP id a17-20020a056870619100b000f2dbca0cbamr16820795oah.267.1654105217868; Wed, 01 Jun 2022 10:40:17 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:a183:7f80:9e50:177b]) by smtp.gmail.com with ESMTPSA id l14-20020a0568301d6e00b0060ae954bf27sm1052578oti.62.2022.06.01.10.40.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 10:40:17 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.35 7/8] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Date: Wed, 1 Jun 2022 14:40:05 -0300 Message-Id: <20220601174006.219504-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220601174006.219504-1-adhemerval.zanella@linaro.org> References: <20220601174006.219504-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.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, 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:40:30 -0000 This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit 634f566c3e20a8a620dbd869a0089e33c105a3ea) --- NEWS | 1 + catgets/open_catalog.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5692715ef2..beaaf7a6c2 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,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.35 diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 48c2a4b983..cb1d123cdb 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -39,7 +39,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; @@ -193,7 +193,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