From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id 2FBFB3858D3C for ; Wed, 1 Jun 2022 17:00:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2FBFB3858D3C Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-e656032735so3573791fac.0 for ; Wed, 01 Jun 2022 10:00:33 -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=JHHOnEDSz/Yt0xtPXBSt2RqwBE4MVQzk6QFP/LtZxrQ=; b=UgivM13COcOJJo7BoCg/a4LuMrWSYTQrPSGwsYUpBK2vAohabbfRApnYuz4FwqUBee h+TDXBZFGW6oZH8wubkqaw0Ranbc7SWH0qscF6qSyIMrYY1MVb+AQAjdBP25a/KmLvWO xvCWycIj1wySA1z2y1tOPP2Z/yqdx/bgNL2J9MRhn+3CDzboYHly1P16MWvfnmO4v4IN H+k7YEavtmeZEIYwyQia30dPipV86vgbjX3zEYm7mwstYM2QqHpguAMKeid30GctV80j WJpowVF8NfOnQQS8vL2QYbpdUXmYWKszYk3Yaonr915FsR6ZMf/zYau3199B8w+8Pkgo Lh8w== X-Gm-Message-State: AOAM531qbWF8agDx2VchPrUgkP6IvYNwUdBKQq70JdpMae8/aPZEeA5w 85QNq1go2JrkPxiw25KR0gCdPCNnWycT2g== X-Google-Smtp-Source: ABdhPJy1XsfsjyyLHrkzGI9XKxuHXd/E1tZQt6Tnem6n3srdqpexsIT99kVk6L3G5FU4LwDJ04JyTA== X-Received: by 2002:a05:6870:4396:b0:f2:b48b:84c with SMTP id r22-20020a056870439600b000f2b48b084cmr17068355oah.104.1654102832255; Wed, 01 Jun 2022 10:00:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 10:00:31 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.34 1/8] misc: Use 64 bit stat for daemon (BZ# 29203) Date: Wed, 1 Jun 2022 14:00:21 -0300 Message-Id: <20220601170028.2638215-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 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:36 -0000 This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit 3fbc33010c76721d34f676d8efb45bcc54e0d575) --- NEWS | 1 + misc/daemon.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index b444478935..46e747a534 100644 --- a/NEWS +++ b/NEWS @@ -101,6 +101,7 @@ The following bugs are resolved with this release: [29078] functions unusable during early auditing [29097] time: fchmodat does not handle 64 bit time_t for AT_SYMLINK_NOFOLLOW + [29203] libc: daemon is not y2038 aware Version 2.34 diff --git a/misc/daemon.c b/misc/daemon.c index 0e688f4d74..3c73ac2ab8 100644 --- a/misc/daemon.c +++ b/misc/daemon.c @@ -61,11 +61,10 @@ daemon (int nochdir, int noclose) (void)__chdir("/"); if (!noclose) { - struct stat64 st; + struct __stat64_t64 st; if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1 - && (__builtin_expect (__fstat64 (fd, &st), 0) - == 0)) { + && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) { if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR && (st.st_rdev -- 2.34.1