mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-09 20:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

ltp: backport ioctl_ns05 fix from upstream

Browse Source 
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>
This commit is contained in:
Paul Gortmaker
2021-08-24 16:18:15 -04:00
committed by Richard Purdie
parent 120e36e89c
commit ef3ad59d2a
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch Normal file
View File

@@ -0,0 +1,59 @@
From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001
From: Marius Hillenbrand <mhillen@linux.ibm.com>
Date: Mon, 19 Jul 2021 13:58:35 +0800
Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for
path
commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream.
Resize the buffer used for paths into /proc/ to grant enough space
for long PIDs. While at it, replace sprintf with snprintf to avoid
buffer overflows if we ever ran out of space again.
Fixes: #847
Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com>
Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>
Upstream-Status: Backport
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
index a67ddbe2c66f..52613810c7ce 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
@@ -59,10 +59,10 @@ static void run(void)
if (pid == -1)
tst_brk(TBROK | TERRNO, "ltp_clone failed");
- char child_namespace[20];
+ char child_namespace[30];
int my_fd, child_fd, parent_fd;
- sprintf(child_namespace, "/proc/%i/ns/pid", pid);
+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid", pid);
my_fd = SAFE_OPEN("/proc/self/ns/pid", O_RDONLY);
child_fd = SAFE_OPEN(child_namespace, O_RDONLY);
parent_fd = ioctl(child_fd, NS_GET_PARENT);
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
index b6ac80208d02..c30f7de91e09 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
@@ -51,14 +51,14 @@ static int child(void *arg LTP_ATTRIBUTE_UNUSED)
static void run(void)
{
- char child_namespace[20];
+ char child_namespace[30];
pid_t pid = ltp_clone(CLONE_NEWUSER | SIGCHLD, &child, 0,
STACK_SIZE, child_stack);
if (pid == -1)
tst_brk(TBROK | TERRNO, "ltp_clone failed");
- sprintf(child_namespace, "/proc/%i/ns/user", pid);
+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/user", pid);
int my_fd, child_fd, parent_fd;
my_fd = SAFE_OPEN("/proc/self/ns/user", O_RDONLY);
--
2.32.0

1
meta/recipes-extended/ltp/ltp_20210524.bb
View File

@@ -31,6 +31,7 @@ SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0001-Remove-OOM-tests-from-runtest-mm.patch \
file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \
"
S = "${WORKDIR}/git"