0001-Add-support-for-io_pgetevents_time64-syscall.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From d1a1b797d961301fd58513e50ac5de9ad5b8bc08 Mon Sep 17 00:00:00 2001
  2. From: Alistair Francis <alistair.francis@wdc.com>
  3. Date: Thu, 29 Aug 2019 13:56:21 -0700
  4. Subject: [PATCH] Add support for io_pgetevents_time64 syscall
  5. 32-bit architectures that are y2038 safe don't include syscalls that use
  6. 32-bit time_t. Instead these architectures have suffixed syscalls that
  7. always use a 64-bit time_t. In the case of the io_getevents syscall the
  8. syscall has been replaced with the io_pgetevents_time64 syscall instead.
  9. This patch changes the io_getevents() function to use the correct
  10. syscall based on the avaliable syscalls and the time_t size. We will
  11. only use the new 64-bit time_t syscall if the architecture is using a
  12. 64-bit time_t. This is to avoid having to deal with 32/64-bit
  13. conversions and relying on a 64-bit timespec struct on 32-bit time_t
  14. platforms. As of Linux 5.3 there are no 32-bit time_t architectures
  15. without __NR_io_getevents. In the future if a 32-bit time_t architecture
  16. wants to use the 64-bit syscalls we can handle the conversion.
  17. This fixes build failures on 32-bit RISC-V.
  18. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  19. Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9819]
  20. ---
  21. engines/e_afalg.c | 16 ++++++++++++++++
  22. 1 file changed, 16 insertions(+)
  23. diff --git a/engines/e_afalg.c b/engines/e_afalg.c
  24. index dacbe358cb..99516cb1bb 100644
  25. --- a/engines/e_afalg.c
  26. +++ b/engines/e_afalg.c
  27. @@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
  28. struct io_event *events,
  29. struct timespec *timeout)
  30. {
  31. +#if defined(__NR_io_getevents)
  32. return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
  33. +#elif defined(__NR_io_pgetevents_time64)
  34. + /* Let's only support the 64 suffix syscalls for 64-bit time_t.
  35. + * This simplifies the code for us as we don't need to use a 64-bit
  36. + * version of timespec with a 32-bit time_t and handle converting
  37. + * between 64-bit and 32-bit times and check for overflows.
  38. + */
  39. + if (sizeof(timeout->tv_sec) == 8)
  40. + return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL);
  41. + else {
  42. + errno = ENOSYS;
  43. + return -1;
  44. + }
  45. +#else
  46. +# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64."
  47. +#endif
  48. }
  49. static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
  50. --
  51. 2.23.0