diff options
author | Petr Vorel <petr.vorel@gmail.com> | 2020-02-29 17:51:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-02 16:16:27 +0000 |
commit | a37dba3063256ef4852522a1b1035a10bcd9860d (patch) | |
tree | 77eb57ce9e5b27825b040c791774f542531545ba /meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch | |
parent | fecd65625ec6fb9a7879cfa18eab95d2b1dda2ff (diff) | |
download | poky-a37dba3063256ef4852522a1b1035a10bcd9860d.tar.gz |
ltp: Update to 20200120
Removed ffsb copying file and associated runtest file fs_ext4
(both removed in this release).
Added LIBS=-lfts for MUSL.
Removed patches (accepted upstream)
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
IMHO this one shouldn't be needed not, but CI still fails without it
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
(From OE-Core rev: 62e2063698477a13c55ae370451e52a2f1e18e45)
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ac8f08ef5a 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch | |||
@@ -1,28 +1,40 @@ | |||
1 | From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 | 1 | From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 12 Feb 2020 22:22:17 -0800 | 3 | Date: Wed, 19 Feb 2020 22:52:04 -0800 |
4 | Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them | 4 | Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them |
5 | 5 | ||
6 | musl is using 64bit time_t now on 32bit architectures and these syscalls | 6 | musl is using 64bit time_t now on 32bit architectures and these syscalls |
7 | no longer exist, therefore its better to check for them being available | 7 | no longer exist, therefore its better to check for them being available |
8 | before using them | 8 | before using them |
9 | 9 | ||
10 | Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> | ||
12 | Reviewed-by: Petr Vorel <pvorel@suse.cz> | ||
13 | Signed-off-by: Petr Vorel <pvorel@suse.cz> | ||
14 | Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 | ||
12 | --- | 15 | --- |
13 | lib/tst_clocks.c | 9 +++++---- | 16 | lib/tst_clocks.c | 16 ++++++---------- |
14 | testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- | 17 | .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- |
15 | testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- | 18 | .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- |
16 | 3 files changed, 10 insertions(+), 13 deletions(-) | 19 | 3 files changed, 11 insertions(+), 19 deletions(-) |
17 | 20 | ||
21 | diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c | ||
22 | index 5195da38f..fa2f1cb84 100644 | ||
18 | --- a/lib/tst_clocks.c | 23 | --- a/lib/tst_clocks.c |
19 | +++ b/lib/tst_clocks.c | 24 | +++ b/lib/tst_clocks.c |
20 | @@ -22,21 +22,22 @@ | 25 | @@ -3,28 +3,24 @@ |
21 | #define _GNU_SOURCE | 26 | * Copyright (c) 2017 Cyril Hrubis <chrubis@suse.cz> |
22 | #include <unistd.h> | 27 | */ |
28 | |||
29 | -/* | ||
30 | - * clock_gettime() and clock_getres() functions | ||
31 | - */ | ||
32 | - | ||
33 | -#define _GNU_SOURCE | ||
34 | -#include <unistd.h> | ||
23 | #include <time.h> | 35 | #include <time.h> |
24 | -#include <sys/syscall.h> | 36 | -#include <sys/syscall.h> |
25 | - | 37 | |
26 | +#define TST_NO_DEFAULT_MAIN | 38 | +#define TST_NO_DEFAULT_MAIN |
27 | +#include "tst_test.h" | 39 | +#include "tst_test.h" |
28 | #include "tst_clocks.h" | 40 | #include "tst_clocks.h" |
@@ -45,6 +57,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
45 | - return syscall(SYS_clock_settime, clk_id, ts); | 57 | - return syscall(SYS_clock_settime, clk_id, ts); |
46 | + return tst_syscall(__NR_clock_settime, clk_id, ts); | 58 | + return tst_syscall(__NR_clock_settime, clk_id, ts); |
47 | } | 59 | } |
60 | diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | ||
61 | index 583d8f7b9..08ea1673a 100644 | ||
48 | --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 62 | --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c |
49 | +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 63 | +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c |
50 | @@ -38,10 +38,8 @@ | 64 | @@ -38,10 +38,8 @@ |
@@ -68,6 +82,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
68 | 82 | ||
69 | /* gettimeofday returns an int, so we need to turn the long | 83 | /* gettimeofday returns an int, so we need to turn the long |
70 | * TEST_RETURN into an int to test with */ | 84 | * TEST_RETURN into an int to test with */ |
85 | diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | ||
86 | index 1d60f448e..5170ad2f7 100644 | ||
71 | --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 87 | --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c |
72 | +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 88 | +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c |
73 | @@ -16,14 +16,12 @@ | 89 | @@ -16,14 +16,12 @@ |
@@ -102,3 +118,5 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
102 | tst_res(TBROK | TERRNO, "gettimeofday() failed"); | 118 | tst_res(TBROK | TERRNO, "gettimeofday() failed"); |
103 | return; | 119 | return; |
104 | } | 120 | } |
121 | -- | ||
122 | 2.25.1 | ||