From c8f7c26148a926c6e49ab95a18c4702204e57551 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 12 Dec 2016 13:59:46 +0800 Subject: ltp: avoid segmentation fault in netns tests * backport a patch to avoid segmentation fault in netns tests. * rename previous patch to have ordered prefix number. (From OE-Core rev: 67f67da5d673ad60d3d3138ba32822679f565267) Signed-off-by: Jackie Huang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 41 ------------------ ...etwork-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 41 ++++++++++++++++++ ...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20160126.bb | 3 +- 4 files changed, 93 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch create mode 100644 meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch deleted file mode 100644 index 04532be79e..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 672a56be14426eae44864673c6c2afca0ab89d46 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= -Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on string - printf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); - -[YOCTO #9548] - -Signed-off-by: Aníbal Limón - -Upstream-Status: Pending ---- - testcases/network/nfsv4/acl/acl1.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index b8b67b4..7c7c506 100644 ---- a/testcases/network/nfsv4/acl/acl1.c -+++ b/testcases/network/nfsv4/acl/acl1.c -@@ -314,7 +314,7 @@ void test_acl_default(char *dir, acl_t acl) - char *cmd = malloc(256); - - strcpy(cmd, "chmod 7777 "); -- printf(cmd); -+ printf(cmd, NULL); - strcat(cmd, dir); - system(cmd); - acl2 = acl_get_file(path, ACL_TYPE_ACCESS); --- -2.1.4 - diff --git a/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch new file mode 100644 index 0000000000..04532be79e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -0,0 +1,41 @@ +From 672a56be14426eae44864673c6c2afca0ab89d46 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= +Date: Fri, 13 May 2016 11:11:28 -0500 +Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on string + printf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + +acl1.c: In function 'test_acl_default': +acl1.c:317:2: error: format not a string literal and no format arguments +[-Werror=format-security] + printf(cmd); + +[YOCTO #9548] + +Signed-off-by: Aníbal Limón + +Upstream-Status: Pending +--- + testcases/network/nfsv4/acl/acl1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c +index b8b67b4..7c7c506 100644 +--- a/testcases/network/nfsv4/acl/acl1.c ++++ b/testcases/network/nfsv4/acl/acl1.c +@@ -314,7 +314,7 @@ void test_acl_default(char *dir, acl_t acl) + char *cmd = malloc(256); + + strcpy(cmd, "chmod 7777 "); +- printf(cmd); ++ printf(cmd, NULL); + strcat(cmd, dir); + system(cmd); + acl2 = acl_get_file(path, ACL_TYPE_ACCESS); +-- +2.1.4 + diff --git a/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch new file mode 100644 index 0000000000..18d1f727f2 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch @@ -0,0 +1,50 @@ +From 193ce739b2a5174269a958b00c3a5590de944e0d Mon Sep 17 00:00:00 2001 +From: Huacai Chen +Date: Thu, 27 Oct 2016 14:45:52 +0800 +Subject: [PATCH] containers/netns_netlink: Avoid segmentation fault + +In order to avoid segmentation fault (use NULL as a function pointer), +this patch modify check_netns() by passing a dummy function pointer to +do_clone_unshare_test(). + +Signed-off-by: Huacai Chen +Signed-off-by: Cyril Hrubis + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang +--- + testcases/kernel/containers/netns/netns_helper.h | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/containers/netns/netns_helper.h b/testcases/kernel/containers/netns/netns_helper.h +index 2a331ae..7df6dcb 100644 +--- a/testcases/kernel/containers/netns/netns_helper.h ++++ b/testcases/kernel/containers/netns/netns_helper.h +@@ -56,6 +56,12 @@ static void check_iproute(unsigned int spe_ipver) + pclose(ipf); + } + ++static int dummy(void *arg) ++{ ++ (void) arg; ++ return 0; ++} ++ + static void check_netns(void) + { + int pid, status; +@@ -64,8 +70,8 @@ static void check_netns(void) + tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported", + CLONE_NEWNS); + +- pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, NULL, +- NULL); ++ pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, ++ dummy, NULL); + if (pid == -1) + tst_brkm(TCONF | TERRNO, NULL, + "unshare syscall smoke test failed"); +-- +2.7.4 + diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb index 7ee84e3557..841302b0ad 100644 --- a/meta/recipes-extended/ltp/ltp_20160126.bb +++ b/meta/recipes-extended/ltp/ltp_20160126.bb @@ -62,7 +62,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ file://0034-periodic_output.patch \ file://0035-fix-test_proc_kill-hang.patch \ - file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ + file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ + file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg