Skip to contentSkip to conversation

syscalls: Check for time64 unsafe syscalls before using them

PATCH Superseded Khem Raj 3 participants 3 messages Feb 13, 2020 Library code

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 syscalls: Check for time64 unsafe syscalls before using them

musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them

---
 lib/tst_clocks.c                                        | 9 +++++++++
 testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++
 testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++
 3 files changed, 17 insertions(+)
lib/tst_clocks.c +9 -0
index 35798a4aaf..6a5b05c4ea 100644
@@ -28,15 +28,24 @@
 
 int tst_clock_getres(clockid_t clk_id, struct timespec *res)
 {
+#if defined(__NR_clock_getres)
 	return syscall(SYS_clock_getres, clk_id, res);
+#endif
+	return -1;
 }
 
 int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
 {
+#if defined(__NR_clock_gettime)
 	return syscall(SYS_clock_gettime, clk_id, ts);
+#endif
+	return -1;
 }
 
 int tst_clock_settime(clockid_t clk_id, struct timespec *ts)
 {
+#if defined(__NR_clock_settime)
 	return syscall(SYS_clock_settime, clk_id, ts);
+#endif
+	return -1;
 }
testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +4 -0
index 583d8f7b9b..b498de5b68 100644
@@ -41,7 +41,11 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#ifdef __NR_gettimeofday
 #define gettimeofday(a,b)  syscall(__NR_gettimeofday,a,b)
+#else
+#define gettimeofday(a,b) (-1)
+#endif
 
 char *TCID = "gettimeofday01";
 int TST_TOTAL = 1;
testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +4 -0
index 1d60f448e8..218e017df8 100644
@@ -23,7 +23,11 @@
 
 #include "tst_test.h"
 
+#ifdef __NR_gettimeofday
 #define gettimeofday(a,b)  syscall(__NR_gettimeofday,a,b)
+#else
+#define gettimeofday(a,b) (-1)
+#endif
 
 static volatile sig_atomic_t done;
 static char *str_rtime;
Signature · 1 line
2.25.0
#1 lore raw

PATCH 1/1 syscalls: Check for time64 unsafe syscalls before using them

Hi Khem

Can we use simple tst_syscall to fix this like commit 333a47be ("socketcall01: Use tst_syscall")?

Best Regards
Yang Xu

Quoted 73 lines

musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them

---
  lib/tst_clocks.c                                        | 9 +++++++++
  testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++
  testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++
  3 files changed, 17 insertions(+)
lib/tst_clocks.c +9 -0
index 35798a4aaf..6a5b05c4ea 100644
@@ -28,15 +28,24 @@
 
  int tst_clock_getres(clockid_t clk_id, struct timespec *res)
  {
+#if defined(__NR_clock_getres)
  	return syscall(SYS_clock_getres, clk_id, res);
+#endif
+	return -1;
  }
 
  int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
  {
+#if defined(__NR_clock_gettime)
  	return syscall(SYS_clock_gettime, clk_id, ts);
+#endif
+	return -1;
  }
 
  int tst_clock_settime(clockid_t clk_id, struct timespec *ts)
  {
+#if defined(__NR_clock_settime)
  	return syscall(SYS_clock_settime, clk_id, ts);
+#endif
+	return -1;
  }
testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +4 -0
index 583d8f7b9b..b498de5b68 100644
@@ -41,7 +41,11 @@
  #include <sys/syscall.h>
  #include <unistd.h>
 
+#ifdef __NR_gettimeofday
  #define gettimeofday(a,b)  syscall(__NR_gettimeofday,a,b)
+#else
+#define gettimeofday(a,b) (-1)
+#endif
 
  char *TCID = "gettimeofday01";
  int TST_TOTAL = 1;
testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +4 -0
index 1d60f448e8..218e017df8 100644
@@ -23,7 +23,11 @@
 
  #include "tst_test.h"
 
+#ifdef __NR_gettimeofday
  #define gettimeofday(a,b)  syscall(__NR_gettimeofday,a,b)
+#else
+#define gettimeofday(a,b) (-1)
+#endif
 
  static volatile sig_atomic_t done;
  static char *str_rtime;
#2 lore raw

PATCH 1/1 syscalls: Check for time64 unsafe syscalls before using them

Hi Khem, Xu,

Quoted 2 lines

Can we use simple tst_syscall to fix this like commit 333a47be ("socketcall01: Use tst_syscall")?

+1
NOTE: legacy API (test.h, used by gettimeofday01.c) uses ltp_syscall().

Kind regards,
Petr