From: Albert ARIBAUD (3ADEV) Date: Thu, 7 Sep 2017 22:41:49 +0000 (+0200) Subject: Y2038: add function __timerfd_settime64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aab10fdfe0e5e94740d68f5b964c53bb50c0f46;p=thirdparty%2Fglibc.git Y2038: add function __timerfd_settime64 For Linux this uses the 32-bit time syscal, so it converts syscall input from 64-bit time into 32-bit time and syscall output from 32-bit time to 64-bit time. --- diff --git a/rt/Makefile b/rt/Makefile index c0aad5d8e22..994891e42d0 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -33,7 +33,7 @@ clock-routines := get_clockfreq clock_getcpuclockid \ clock_nanosleep timer-routines := timer_create timer_delete timer_getoverr \ timer_gettime timer_settime \ - timerfd_gettime64 + timerfd_gettime64 timerfd_settime64 shm-routines := shm_open shm_unlink mq-routines := mq_open mq_close mq_unlink mq_getattr mq_setattr \ mq_notify mq_send mq_receive mq_timedsend \ diff --git a/rt/Versions b/rt/Versions index 7cee85588ab..8f757ed5d9f 100644 --- a/rt/Versions +++ b/rt/Versions @@ -41,5 +41,6 @@ librt { __timer_gettime64; __timer_settime64; __timerfd_gettime64; + __timerfd_settime64; } } diff --git a/rt/timerfd_settime64.c b/rt/timerfd_settime64.c new file mode 100644 index 00000000000..39ce88bbf76 --- /dev/null +++ b/rt/timerfd_settime64.c @@ -0,0 +1,30 @@ +/* Set timer TIMERID to VALUE, returning old value in OVALUE. + + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +int +__timerfd_settime64 (int fd, int flags, const struct itimerspec *value, + struct itimerspec *ovalue) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__timerfd_settime64) diff --git a/sysdeps/unix/sysv/linux/arm/librt.abilist b/sysdeps/unix/sysv/linux/arm/librt.abilist index bcfdc228440..344fa5b6a48 100644 --- a/sysdeps/unix/sysv/linux/arm/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/librt.abilist @@ -1,6 +1,7 @@ GLIBC_2.29 __timer_gettime64 F GLIBC_2.29 __timer_settime64 F GLIBC_2.29 __timerfd_gettime64 F +GLIBC_2.29 __timerfd_settime64 F GLIBC_2.4 aio_cancel F GLIBC_2.4 aio_cancel64 F GLIBC_2.4 aio_error F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index eabb7609c0f..f34ae35671a 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -30,6 +30,7 @@ GLIBC_2.2 timer_settime F GLIBC_2.29 __timer_gettime64 F GLIBC_2.29 __timer_settime64 F GLIBC_2.29 __timerfd_gettime64 F +GLIBC_2.29 __timerfd_settime64 F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F GLIBC_2.3.4 mq_notify F diff --git a/sysdeps/unix/sysv/linux/timerfd_settime64.c b/sysdeps/unix/sysv/linux/timerfd_settime64.c new file mode 100644 index 00000000000..fc31f5a884f --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_settime64.c @@ -0,0 +1,72 @@ +/* Set timer TIMERID to VALUE, returning old value in OVALUE. + + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#include +#include +#include +#include +#include +#include "kernel-posix-timers.h" + +int +__timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value, + struct __itimerspec64 *ovalue) +{ + int res; + struct itimerspec value32; + struct itimerspec ovalue32; + + if (value == NULL) + return EFAULT; + +#ifdef __NR_timerfd_settime64 + if (__y2038_get_kernel_support () > 0) + { + res = INLINE_SYSCALL (timerfd_settime64, 3, fd, value, ovalue); + if (res == 0 || errno != ENOSYS) + return res; + __y2038_set_kernel_support (-1); + } +#endif + + if (value->it_value.tv_sec > INT_MAX + || value->it_interval.tv_sec > INT_MAX) + { + __set_errno(EOVERFLOW); + return -1; + } + + value32.it_value.tv_sec = value->it_value.tv_sec; + value32.it_value.tv_nsec = value->it_value.tv_nsec; + value32.it_interval.tv_sec = value->it_interval.tv_sec; + value32.it_interval.tv_nsec = value->it_interval.tv_nsec; + + res = INLINE_SYSCALL (timerfd_settime, 4, fd, flags, + &value32, &ovalue32); + + if (res == 0 && ovalue != NULL) + { + ovalue->it_value.tv_sec = ovalue32.it_value.tv_sec; + ovalue->it_value.tv_nsec = ovalue32.it_value.tv_nsec; + ovalue->it_interval.tv_sec = ovalue32.it_interval.tv_sec; + ovalue->it_interval.tv_nsec = ovalue32.it_interval.tv_nsec; + } + + return res; +}