sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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)

(From OE-Core rev: c8f7c26148a926c6e49ab95a18c4702204e57551)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang 2016-12-12 13:59:46 +08:00 committed by Richard Purdie
parent 0fe7a940e2
commit 54445dec1c
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch → meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
View File

50
meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch Normal file
View File

@ -0,0 +1,50 @@
From 193ce739b2a5174269a958b00c3a5590de944e0d Mon Sep 17 00:00:00 2001
From: Huacai Chen <chenhc@lemote.com>
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 <chenhc@lemote.com>
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Upstream-Status: Backport
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
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

3
meta/recipes-extended/ltp/ltp_20160126.bb
View File

@ -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"