summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2021-08-24 20:18:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-26 07:07:55 (GMT)
commitef3ad59d2ae54b12871c4e867edadaac42b2e357 (patch)
tree577ccf3a2e2e9c79422d03fa981ccd057fbe2b1c /meta
parent120e36e89c07e9fb2369f16aec81bc3217a82ed2 (diff)
downloadpoky-ef3ad59d2ae54b12871c4e867edadaac42b2e357.tar.gz
ltp: backport ioctl_ns05 fix from upstream
This false positive keeps showing up in our testing but the fix isn't yet a part of a tagged release, and it is probably too late for doing an uprev for the fall release anyway. (From OE-Core rev: f216d7e3e7eb94f53a69e25c805344b04ada60f5) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch59
-rw-r--r--meta/recipes-extended/ltp/ltp_20210524.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
new file mode 100644
index 0000000..08b88a3
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
@@ -0,0 +1,59 @@
1From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001
2From: Marius Hillenbrand <mhillen@linux.ibm.com>
3Date: Mon, 19 Jul 2021 13:58:35 +0800
4Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for
5 path
6
7commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream.
8
9Resize the buffer used for paths into /proc/ to grant enough space
10for long PIDs. While at it, replace sprintf with snprintf to avoid
11buffer overflows if we ever ran out of space again.
12
13Fixes: #847
14Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com>
15Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>
16Upstream-Status: Backport
17Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
18
19diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
20index a67ddbe2c66f..52613810c7ce 100644
21--- a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
22+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
23@@ -59,10 +59,10 @@ static void run(void)
24 if (pid == -1)
25 tst_brk(TBROK | TERRNO, "ltp_clone failed");
26
27- char child_namespace[20];
28+ char child_namespace[30];
29 int my_fd, child_fd, parent_fd;
30
31- sprintf(child_namespace, "/proc/%i/ns/pid", pid);
32+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid", pid);
33 my_fd = SAFE_OPEN("/proc/self/ns/pid", O_RDONLY);
34 child_fd = SAFE_OPEN(child_namespace, O_RDONLY);
35 parent_fd = ioctl(child_fd, NS_GET_PARENT);
36diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
37index b6ac80208d02..c30f7de91e09 100644
38--- a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
39+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
40@@ -51,14 +51,14 @@ static int child(void *arg LTP_ATTRIBUTE_UNUSED)
41
42 static void run(void)
43 {
44- char child_namespace[20];
45+ char child_namespace[30];
46
47 pid_t pid = ltp_clone(CLONE_NEWUSER | SIGCHLD, &child, 0,
48 STACK_SIZE, child_stack);
49 if (pid == -1)
50 tst_brk(TBROK | TERRNO, "ltp_clone failed");
51
52- sprintf(child_namespace, "/proc/%i/ns/user", pid);
53+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/user", pid);
54 int my_fd, child_fd, parent_fd;
55
56 my_fd = SAFE_OPEN("/proc/self/ns/user", O_RDONLY);
57--
582.32.0
59
diff --git a/meta/recipes-extended/ltp/ltp_20210524.bb b/meta/recipes-extended/ltp/ltp_20210524.bb
index 702fa62..20e2def 100644
--- a/meta/recipes-extended/ltp/ltp_20210524.bb
+++ b/meta/recipes-extended/ltp/ltp_20210524.bb
@@ -31,6 +31,7 @@ SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
31 31
32SRC_URI = "git://github.com/linux-test-project/ltp.git \ 32SRC_URI = "git://github.com/linux-test-project/ltp.git \
33 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 33 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
34 file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \
34 " 35 "
35 36
36S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"