fortify-headers

commit b40f6d87482f20e968b27470baca042e50cd6792
parent fa40365faea6b87288504f0d8ad39dab8ff302b4
Author: jvoisin <julien.voisin@dustri.org>
Date:   Tue, 30 May 2023 20:13:40 +0200

Fix inconsistent time_t version of ppoll

fortify/poll.h includes poll.h, which redirects the ppoll sys call to __ppoll_time64,
if the _REDIR_TIME64 macro is 1. Then fortify/poll.h will #undef ppoll and use the 32 bit version, which is inconsistent.

Taken from: https://github.com/openwrt/openwrt/pull/12575

Diffstat:
M
include/poll.h
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/poll.h b/include/poll.h
@@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s)
 	return __orig_poll(__f, __n, __s);
 }
 
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && !_REDIR_TIME64
 #undef ppoll
 _FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
                              const sigset_t *__m)