Re: [PATCH v3] Linux: Add ppoll fortify symbol for 64 bit time_t (BZ# 29746)

[Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>]

On 08/11/22 10:28, Andreas Schwab wrote:
> On Nov 08 2022, Adhemerval Zanella wrote:
> 
>> diff --git a/include/sys/poll.h b/include/sys/poll.h
>> index f904e21f89..af032048e4 100644
>> --- a/include/sys/poll.h
>> +++ b/include/sys/poll.h
>> @@ -2,16 +2,22 @@
>>  # include <io/sys/poll.h>
>>  
>>  #ifndef _ISOMAC
>> +#include <include/struct___timespec64.h>
>> +
>>  extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
>>  		   int __timeout);
>>  libc_hidden_proto (__poll)
>> +
>>  libc_hidden_proto (ppoll)
>>  
>>  # if __TIMESIZE == 64
>> -#  define __ppoll64 __ppoll
>> +#  define ppoll64 ppoll
>> +#  define __ppoll64 ppoll
>> +#  define __ppoll64_chk __ppoll_chk
>>  # else
>>  # include <time.h>
>>  # include <signal.h>
>> +# define ppoll64 __ppoll64
> 
> Why do you need that indirection through the ppoll64 macro?
> 

Indeed there is no need with the change below:

diff --git a/include/sys/poll.h b/include/sys/poll.h
index af032048e4..5555fa2cee 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -17,7 +17,6 @@ libc_hidden_proto (ppoll)
 # else
 # include <time.h>
 # include <signal.h>
-# define ppoll64 __ppoll64

 extern int __ppoll64 (struct pollfd *fds, nfds_t nfds,
                       const struct __timespec64 *timeout,
diff --git a/sysdeps/unix/sysv/linux/ppoll_chk.c b/sysdeps/unix/sysv/linux/ppoll_chk.c
index e8115623e6..65c4b56671 100644
--- a/sysdeps/unix/sysv/linux/ppoll_chk.c
+++ b/sysdeps/unix/sysv/linux/ppoll_chk.c
@@ -26,7 +26,7 @@ __ppoll64_chk (struct pollfd *fds, nfds_t nfds,
   if (fdslen / sizeof (*fds) < nfds)
     __chk_fail ();

-  return ppoll64 (fds, nfds, tmo, ss);
+  return __ppoll64 (fds, nfds, tmo, ss);
 }

 #if __TIMESIZE != 64

Do I need to send another version or are you ok with this one with the
above change?