diff options
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch | 40 |
1 files changed, 0 insertions, 40 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 deleted file mode 100644 index 5096a85c1e..0000000000 --- a/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d Mon Sep 17 00:00:00 2001 | ||
2 | From: Li Wang <liwang@redhat.com> | ||
3 | Date: Tue, 23 Jan 2018 17:46:35 +0800 | ||
4 | Subject: [PATCH] safe_macros: make is_fuse() return zero if fs_type is NULL | ||
5 | |||
6 | This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) | ||
7 | involves FUSE fs check in safe_mount(), but we'd better guarantee the "fs_type" | ||
8 | is 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 | |||
17 | Signed-off-by: Li Wang <liwang@redhat.com> | ||
18 | Acked-by: Jan Stancek <jstancek@redhat.com> | ||
19 | Upstream-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 | |||
24 | diff --git a/lib/safe_macros.c b/lib/safe_macros.c | ||
25 | index 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 | -- | ||
39 | 2.11.0 | ||
40 | |||