From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 013F63856DF8; Wed, 1 Jun 2022 17:38:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 013F63856DF8 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] misc: Use 64 bit stat for daemon (BZ# 29203) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 6abb4002df97df668f40b0da84ab6261498a8541 X-Git-Newrev: cb49c141838d34b653389d60c857dca91bceaf5d Message-Id: <20220601173850.013F63856DF8@sourceware.org> Date: Wed, 1 Jun 2022 17:38:50 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 17:38:50 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cb49c141838d34b653389d60c857dca91bceaf5d commit cb49c141838d34b653389d60c857dca91bceaf5d Author: Adhemerval Zanella Date: Tue May 31 11:46:59 2022 -0300 misc: Use 64 bit stat for daemon (BZ# 29203) This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit 3fbc33010c76721d34f676d8efb45bcc54e0d575) Diff: --- 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