5f265ff1c6
* Wed Jun 8 2022 Florian Weimer <fweimer@redhat.com> - 2.34-37 - Enable rseq by default and add GLIBC_2.35 rseq symbols (#2085529) * Wed Jun 8 2022 Florian Weimer <fweimer@redhat.com> - 2.34-36 - Sync with upstream branch release/2.34/master, commit 4c92a1041257c0155c6aa7a182fe5f78e477b0e6: - powerpc: Fix VSX register number on __strncpy_power9 [BZ #29197] - socket: Fix mistyped define statement in socket/sys/socket.h (BZ #29225) - iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213) - catgets: Use 64 bit stat for __open_catalog (BZ# 29211) - inet: Use 64 bit stat for ruserpass (BZ# 29210) - socket: Use 64 bit stat for isfdtype (BZ# 29209) - posix: Use 64 bit stat for fpathconf (_PC_ASYNC_IO) (BZ# 29208) - posix: Use 64 bit stat for posix_fallocate fallback (BZ# 29207) - misc: Use 64 bit stat for getusershell (BZ# 29204) - misc: Use 64 bit stat for daemon (BZ# 29203) Resolves: #2085529 Resolves: #2091549 Related: #2091541
31 lines
977 B
Diff
31 lines
977 B
Diff
commit b349fe072275bfc5763110a49fe6ef1b44d60289
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
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 --git a/misc/daemon.c b/misc/daemon.c
|
|
index 0e688f4d7482e335..3c73ac2ab8709812 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
|