aboutsummaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-01-30 11:25:07 -0500
committerRich Felker <dalias@aerifal.cx>2020-01-30 11:25:07 -0500
commit5a105f19b5aae79dd302899e634b6b18b3dcd0d6 (patch)
treeb96bcfdc32cdbf4a16eaf1fea74e4c52bffd52ba /arch/i386
parente6093b5a870a38ebfb3e54382acd48c698bde15d (diff)
downloadmusl-5a105f19b5aae79dd302899e634b6b18b3dcd0d6.tar.gz
musl-5a105f19b5aae79dd302899e634b6b18b3dcd0d6.tar.xz
musl-5a105f19b5aae79dd302899e634b6b18b3dcd0d6.zip
remove legacy clock_gettime and gettimeofday from public syscall.h
some nontrivial number of applications have historically performed direct syscalls for these operations rather than using the public functions. such usage is invalid now that time_t is 64-bit and these syscalls no longer match the types they are used with, and it was already harmful before (by suppressing use of vdso). since syscall() has no type safety, incorrect usage of these syscalls can't be caught at compile-time. so, without manually inspecting or running additional tools to check sources, the risk of such errors slipping through is high. this patch renames the syscalls on 32-bit archs to clock_gettime32 and gettimeofday_time32, so that applications using the original names will fail to build without being fixed. note that there are a number of other syscalls that may also be unsafe to use directly after the time64 switchover, but (1) these are the main two that seem to be in widespread use, and (2) most of the others continue to have valid usage with a null timeval/timespec argument, as the argument is an optional timeout or similar.
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/bits/syscall.h.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/bits/syscall.h.in b/arch/i386/bits/syscall.h.in
index bb841677..a96317c0 100644
--- a/arch/i386/bits/syscall.h.in
+++ b/arch/i386/bits/syscall.h.in
@@ -76,7 +76,7 @@
#define __NR_setrlimit 75
#define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */
#define __NR_getrusage 77
-#define __NR_gettimeofday 78
+#define __NR_gettimeofday_time32 78
#define __NR_settimeofday 79
#define __NR_getgroups 80
#define __NR_setgroups 81
@@ -262,7 +262,7 @@
#define __NR_timer_getoverrun (__NR_timer_create+3)
#define __NR_timer_delete (__NR_timer_create+4)
#define __NR_clock_settime (__NR_timer_create+5)
-#define __NR_clock_gettime (__NR_timer_create+6)
+#define __NR_clock_gettime32 (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_clock_nanosleep (__NR_timer_create+8)
#define __NR_statfs64 268