public inbox for libc-stable@sourceware.org
 help / color / mirror / Atom feed
* [COMMITTED 2.34 1/8] misc: Use 64 bit stat for daemon (BZ# 29203)
@ 2022-06-01 17:00 Adhemerval Zanella
  2022-06-01 17:00 ` [COMMITTED 2.34 2/8] misc: Use 64 bit stat for getusershell (BZ# 29204) Adhemerval Zanella
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Adhemerval Zanella @ 2022-06-01 17:00 UTC (permalink / raw)
  To: libc-stable

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] <dlfcn.h> 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
 
 \f
 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


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-06-01 17:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-01 17:00 [COMMITTED 2.34 1/8] misc: Use 64 bit stat for daemon (BZ# 29203) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 2/8] misc: Use 64 bit stat for getusershell (BZ# 29204) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 3/8] posix: Use 64 bit stat for posix_fallocate fallback (BZ# 29207) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 4/8] posix: Use 64 bit stat for fpathconf (_PC_ASYNC_IO) (BZ# 29208) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 5/8] socket: Use 64 bit stat for isfdtype (BZ# 29209) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 6/8] inet: Use 64 bit stat for ruserpass (BZ# 29210) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 7/8] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Adhemerval Zanella
2022-06-01 17:00 ` [COMMITTED 2.34 8/8] iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213) Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).