From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by sourceware.org (Postfix) with ESMTPS id 6E0B93856DD4 for ; Wed, 1 Jun 2022 17:40:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E0B93856DD4 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-e5e433d66dso3642615fac.5 for ; Wed, 01 Jun 2022 10:40:11 -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=qA3c20epO6GvzANrULE6LARqfGegyojFG3pDSzHmq7A=; b=hfVOjNGGPchNlwtSs3t57Coa3FrPnvJGXDDqZPlk5QxY9BHfAKZIahz0domjHSCxCv n1NgZCQA4Bl9qQokXc4Jv3SFSIARiFS7H+b5YYoEttgoP2qM5gFOPeeMwYQGLbdSWaXe 9b+NNwI06/SiR3JF8jWJgVJmyRQQnjzMYzNT3rsmFfOEQRCvHjEkAPj6x2NLnD1ZAE3c YWr4/IQL1YF1lFICbNot9HvmJ1u5i5X0OB0mztfoBR58kkn9AvMGk8QU5GTwhghRTFBq He78BDLJixCR/kuYhdUEbx3ro9VXOlLUFSjLQrRV5oNyPh/erJNxO69cobS5RopbcCVZ 72rA== X-Gm-Message-State: AOAM533Zeeottigh7wONMfk/TaCvTqPNzX/qfa6ZNQRdVf06n81VMPEz OJaH5TgITOYmKUei/jRRXoIX0Gl68fsXjQ== X-Google-Smtp-Source: ABdhPJxSuK/mcvrGVGWn6Klv4pYGd1wRlI2htdxjZz96mI2e9K/dST52jezTxdEVejB/aIhicgJn1A== X-Received: by 2002:a05:6870:d14c:b0:f3:18a2:1864 with SMTP id f12-20020a056870d14c00b000f318a21864mr11503726oac.8.1654105210698; Wed, 01 Jun 2022 10:40:10 -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.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 10:40:10 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.35 1/8] misc: Use 64 bit stat for daemon (BZ# 29203) Date: Wed, 1 Jun 2022 14:39:59 -0300 Message-Id: <20220601174006.219504-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.6 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:13 -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 6c6dc03c6e..cbb3ac5827 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,7 @@ The following bugs are resolved with this release: AT_SYMLINK_NOFOLLOW [29109] libc: posix_spawn() always returns 1 (EPERM) on clone() failure + [29203] libc: daemon is not y2038 aware Version 2.35 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