diff options
author | Petr Vorel <petr.vorel@gmail.com> | 2020-02-29 17:51:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-02 16:16:27 +0000 |
commit | 2af240a7d409c9b1988006ebc1a145046fccca41 (patch) | |
tree | 5e87266510255d2c48ed8bf97ed2c421f1dab715 /meta/recipes-extended | |
parent | a37dba3063256ef4852522a1b1035a10bcd9860d (diff) | |
download | poky-2af240a7d409c9b1988006ebc1a145046fccca41.tar.gz |
ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
(From OE-Core rev: 2497b28b14bd70c0a4c94fc22a74ea62c527b410)
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')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp_20200120.bb | 1 |
2 files changed, 0 insertions, 69 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Hongzhi.Song" <hongzhi.song@windriver.com> | ||
3 | Date: Wed, 10 Oct 2018 22:07:05 -0400 | ||
4 | Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit | ||
5 | |||
6 | Mips will return EINVAL instead of ENOMEM as expected | ||
7 | if the range [addr + len) exceeds TASK_SIZE. | ||
8 | |||
9 | Linux kernel code: arch/mips/mm/mmap.c | ||
10 | if (flags & MAP_FIXED) { | ||
11 | /* Even MAP_FIXED mappings must reside within TASK_SIZE */ | ||
12 | if (TASK_SIZE - len < addr) | ||
13 | return -EINVAL; | ||
14 | |||
15 | Relax the condition and accept both ENOMEM and EINVAL | ||
16 | as expected outcome. | ||
17 | |||
18 | Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] | ||
19 | |||
20 | Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> | ||
21 | --- | ||
22 | .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- | ||
23 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
24 | |||
25 | diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c | ||
26 | index 9cf83d9..55090a6 100644 | ||
27 | --- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c | ||
28 | +++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c | ||
29 | @@ -7,7 +7,7 @@ | ||
30 | * source tree. | ||
31 | * | ||
32 | * The mmap() function shall fail if: | ||
33 | - * [ENOMEM] MAP_FIXED was specified, | ||
34 | + * [ENOMEM or EINVAL] MAP_FIXED was specified, | ||
35 | * and the range [addr,addr+len) exceeds that allowed | ||
36 | * for the address space of a process; or, if MAP_FIXED was not specified and | ||
37 | * there is insufficient room in the address space to effect the mapping. | ||
38 | @@ -15,7 +15,7 @@ | ||
39 | * Test Step: | ||
40 | * 1. Map a shared memory object, with size exceeding the value get from | ||
41 | * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; | ||
42 | - * 3. Should get ENOMEM. | ||
43 | + * 3. Should get ENOMEM or EINVAL. | ||
44 | */ | ||
45 | |||
46 | #include <stdio.h> | ||
47 | @@ -92,8 +92,8 @@ int main(void) | ||
48 | (unsigned long)len); | ||
49 | pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, | ||
50 | 0); | ||
51 | - if (pa == MAP_FAILED && errno == ENOMEM) { | ||
52 | - printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); | ||
53 | + if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { | ||
54 | + printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); | ||
55 | exit(PTS_PASS); | ||
56 | } | ||
57 | |||
58 | @@ -102,6 +102,6 @@ int main(void) | ||
59 | else | ||
60 | munmap(pa, len); | ||
61 | close(fd); | ||
62 | - printf("Test Fail: Did not get ENOMEM as expected\n"); | ||
63 | + printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); | ||
64 | return PTS_FAIL; | ||
65 | } | ||
66 | -- | ||
67 | 2.7.4 | ||
68 | |||
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 3cc10afa0c..5be9489a75 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb | |||
@@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ | |||
35 | file://0004-guard-mallocopt-with-__GLIBC__.patch \ | 35 | file://0004-guard-mallocopt-with-__GLIBC__.patch \ |
36 | file://0007-Fix-test_proc_kill-hanging.patch \ | 36 | file://0007-Fix-test_proc_kill-hanging.patch \ |
37 | file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ | 37 | file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ |
38 | file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ | ||
39 | file://0001-Add-more-musl-exclusions.patch \ | 38 | file://0001-Add-more-musl-exclusions.patch \ |
40 | file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ | 39 | file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ |
41 | " | 40 | " |