| Message ID | 20180212223808.9016-1-anders.roxell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] ltp: fix fanotify06 test | expand |
please ignore this patch. Cheers, Anders On 12 February 2018 at 23:38, Anders Roxell <anders.roxell@linaro.org> wrote: > This patch fixes the fanotify06 test. > > http://lists.linux.it/pipermail/ltp/2018-January/006915.html > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > ...anotify-the-mount-fs_type-should-be-given.patch | 38 ++++++++++++++++++++++ > meta/recipes-extended/ltp/ltp_20180118.bb | 1 + > 2 files changed, 39 insertions(+) > create mode 100644 meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > > diff --git a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > new file mode 100644 > index 0000000000..e57b6cd91e > --- /dev/null > +++ b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > @@ -0,0 +1,38 @@ > +From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001 > +From: Li Wang <liwang@redhat.com> > +Date: Tue, 23 Jan 2018 16:23:14 +0800 > +Subject: [PATCH 40/40] fanotify: the mount fs_type should be given > + > +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) > +involves FUSE fs check in safe_mount(), so we should give the "fs_type" when > +calling that in case the system kill our program. > + > + cmdline="fanotify06" > + contacts="" > + analysis=exit > + <<<test_output>>> > + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s > + tst_test.c:1025: BROK: Test killed by SIGSEGV! > + > +Signed-off-by: Li Wang <liwang@redhat.com> > +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2018-January/006915.html] > +--- > + testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c > +index e63e457a1..8cbe1adc6 100644 > +--- a/testcases/kernel/syscalls/fanotify/fanotify06.c > ++++ b/testcases/kernel/syscalls/fanotify/fanotify06.c > +@@ -221,7 +221,7 @@ void test01(void) > + static void setup(void) > + { > + SAFE_MKDIR(MOUNT_NAME, 0755); > +- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL); > ++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); > + mount_created = 1; > + SAFE_CHDIR(MOUNT_NAME); > + > +-- > +2.11.0 > + > diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb > index 369b98df9b..88f3bb4879 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 \ > file://0035-fix-test_proc_kill-hang.patch \ > file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ > + file://0040-fanotify-the-mount-fs_type-should-be-given.patch \ > " > > S = "${WORKDIR}/git" > -- > 2.11.0 > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch new file mode 100644 index 0000000000..e57b6cd91e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch @@ -0,0 +1,38 @@ +From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001 +From: Li Wang <liwang@redhat.com> +Date: Tue, 23 Jan 2018 16:23:14 +0800 +Subject: [PATCH 40/40] fanotify: the mount fs_type should be given + +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) +involves FUSE fs check in safe_mount(), so we should give the "fs_type" when +calling that in case the system kill our program. + + cmdline="fanotify06" + contacts="" + analysis=exit + <<<test_output>>> + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s + tst_test.c:1025: BROK: Test killed by SIGSEGV! + +Signed-off-by: Li Wang <liwang@redhat.com> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2018-January/006915.html] +--- + testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c +index e63e457a1..8cbe1adc6 100644 +--- a/testcases/kernel/syscalls/fanotify/fanotify06.c ++++ b/testcases/kernel/syscalls/fanotify/fanotify06.c +@@ -221,7 +221,7 @@ void test01(void) + static void setup(void) + { + SAFE_MKDIR(MOUNT_NAME, 0755); +- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL); ++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); + mount_created = 1; + SAFE_CHDIR(MOUNT_NAME); + +-- +2.11.0 + diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb index 369b98df9b..88f3bb4879 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 \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0040-fanotify-the-mount-fs_type-should-be-given.patch \ " S = "${WORKDIR}/git"
This patch fixes the fanotify06 test. http://lists.linux.it/pipermail/ltp/2018-January/006915.html Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- ...anotify-the-mount-fs_type-should-be-given.patch | 38 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20180118.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core