1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Feb 2020 22:52:04 -0800
Subject: [PATCH] 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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812
---
lib/tst_clocks.c | 16 ++++++----------
.../syscalls/gettimeofday/gettimeofday01.c | 6 ++----
.../syscalls/gettimeofday/gettimeofday02.c | 8 +++-----
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c
index 5195da38f..fa2f1cb84 100644
--- a/lib/tst_clocks.c
+++ b/lib/tst_clocks.c
@@ -3,28 +3,24 @@
* Copyright (c) 2017 Cyril Hrubis <chrubis@suse.cz>
*/
-/*
- * clock_gettime() and clock_getres() functions
- */
-
-#define _GNU_SOURCE
-#include <unistd.h>
#include <time.h>
-#include <sys/syscall.h>
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
#include "tst_clocks.h"
+#include "lapi/syscalls.h"
int tst_clock_getres(clockid_t clk_id, struct timespec *res)
{
- return syscall(SYS_clock_getres, clk_id, res);
+ return tst_syscall(__NR_clock_getres, clk_id, res);
}
int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
{
- return syscall(SYS_clock_gettime, clk_id, ts);
+ return tst_syscall(__NR_clock_gettime, clk_id, ts);
}
int tst_clock_settime(clockid_t clk_id, struct timespec *ts)
{
- return syscall(SYS_clock_settime, clk_id, ts);
+ return tst_syscall(__NR_clock_settime, clk_id, ts);
}
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
index 583d8f7b9..08ea1673a 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
@@ -38,10 +38,8 @@
#include <sys/time.h>
#include <errno.h>
#include "test.h"
-#include <sys/syscall.h>
#include <unistd.h>
-
-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b)
+#include "lapi/syscalls.h"
char *TCID = "gettimeofday01";
int TST_TOTAL = 1;
@@ -63,7 +61,7 @@ int main(int ac, char **av)
for (lc = 0; TEST_LOOPING(lc); lc++) {
tst_count = 0;
- TEST(gettimeofday((void *)-1, (void *)-1));
+ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1));
/* gettimeofday returns an int, so we need to turn the long
* TEST_RETURN into an int to test with */
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
index 1d60f448e..5170ad2f7 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
@@ -16,14 +16,12 @@
#include <stdint.h>
#include <sys/time.h>
#include <stdlib.h>
-#include <sys/syscall.h>
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include "tst_test.h"
-
-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b)
+#include "lapi/syscalls.h"
static volatile sig_atomic_t done;
static char *str_rtime;
@@ -48,13 +46,13 @@ static void verify_gettimeofday(void)
alarm(rtime);
- if (gettimeofday(&tv1, NULL)) {
+ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) {
tst_res(TBROK | TERRNO, "gettimeofday() failed");
return;
}
while (!done) {
- if (gettimeofday(&tv2, NULL)) {
+ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) {
tst_res(TBROK | TERRNO, "gettimeofday() failed");
return;
}
--
2.25.1
|
