summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-02-13 12:57:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:40 +0000
commit17dd9c4a1b08e8120d716ac9dcc098050bcdaf15 (patch)
tree5eb87ffcebca3c641431d2b4126aad1615de015c /meta/recipes-extended
parent4f61b2ad2a81570a5a75ec3dfc95064170e2184a (diff)
downloadpoky-17dd9c4a1b08e8120d716ac9dcc098050bcdaf15.tar.gz
ltp: fix fanotify06 test
(From OE-Core rev: 514ffed6a2d42f0a1c40c906e7502cfd7e590a0f) Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch40
-rw-r--r--meta/recipes-extended/ltp/ltp_20180118.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch b/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
new file mode 100644
index 0000000000..5096a85c1e
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
@@ -0,0 +1,40 @@
1From 67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d Mon Sep 17 00:00:00 2001
2From: Li Wang <liwang@redhat.com>
3Date: Tue, 23 Jan 2018 17:46:35 +0800
4Subject: [PATCH] safe_macros: make is_fuse() return zero if fs_type is NULL
5
6This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs)
7involves FUSE fs check in safe_mount(), but we'd better guarantee the "fs_type"
8is legal to check in is_fuse() function otherwise system will kill the program.
9
10 cmdline="fanotify06"
11 contacts=""
12 analysis=exit
13 <<<test_output>>>
14 tst_test.c:980: INFO: Timeout per run is 0h 10m 00s
15 tst_test.c:1025: BROK: Test killed by SIGSEGV!
16
17Signed-off-by: Li Wang <liwang@redhat.com>
18Acked-by: Jan Stancek <jstancek@redhat.com>
19Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d]
20---
21 lib/safe_macros.c | 3 +++
22 1 file changed, 3 insertions(+)
23
24diff --git a/lib/safe_macros.c b/lib/safe_macros.c
25index c48e436dc..abdeca013 100644
26--- a/lib/safe_macros.c
27+++ b/lib/safe_macros.c
28@@ -708,6 +708,9 @@ static int is_fuse(const char *fs_type)
29 {
30 unsigned int i;
31
32+ if (!fs_type)
33+ return 0;
34+
35 for (i = 0; i < ARRAY_SIZE(fuse_fs_types); i++) {
36 if (!strcmp(fuse_fs_types[i], fs_type))
37 return 1;
38--
392.11.0
40
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index 3ed7172ff8..d918712c7c 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -43,6 +43,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
43 file://0035-fix-test_proc_kill-hang.patch \ 43 file://0035-fix-test_proc_kill-hang.patch \
44 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 44 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
45 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ 45 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
46 file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \
46 " 47 "
47 48
48S = "${WORKDIR}/git" 49S = "${WORKDIR}/git"