mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
4194a9aaec
This commit adds patches, which were all backported from upstream, or
submitted upstream, and that fix various CVEs. To facilitate the
backporting work, we took the backports from openembedded-core.
CVE-2021-42380: this one is not marked by NVD as affecting 1.36.1, but
its fix was merged after 1.36.1, so it seems like the NVD data is
incorrect. Therefore, no need for a BUSYBOX_IGNORE_CVES entry. Patch
is upstream, backport taken from openembedded-core.
CVE-2023-42363, CVE-2023-42364, CVE-2023-42365: patches are upstream,
backports taken from openembedded-core.
CVE-2023-42366: patch has been submitted upstream but not merged,
patch taken from openembedded-core.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 75c594d446)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 54e64812090f58cffca08fcf11d2dbc471c964e1 Mon Sep 17 00:00:00 2001
|
|
From: Valery Ushakov <uwe@stderr.spb.ru>
|
|
Date: Wed, 24 Jan 2024 22:24:41 +0300
|
|
Subject: [PATCH] awk.c: fix CVE-2023-42366 (bug #15874)
|
|
|
|
Make sure we don't read past the end of the string in next_token()
|
|
when backslash is the last character in an (invalid) regexp.
|
|
a fix and issue reported in bugzilla
|
|
|
|
https://bugs.busybox.net/show_bug.cgi?id=15874
|
|
|
|
Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2024-May/090766.html]
|
|
|
|
CVE: CVE-2023-42366
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
[Thomas: https://git.openembedded.org/openembedded-core/tree/meta/recipes-core/busybox/busybox/0001-awk.c-fix-CVE-2023-42366-bug-15874.patch?id=e0ff4813b1cf4df0d851c857d57fb88d7db51bdd]
|
|
Upstream: http://lists.busybox.net/pipermail/busybox/2024-May/090766.html
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
editors/awk.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/editors/awk.c b/editors/awk.c
|
|
index 9467f4644..947195333 100644
|
|
--- a/editors/awk.c
|
|
+++ b/editors/awk.c
|
|
@@ -1168,9 +1168,11 @@ static uint32_t next_token(uint32_t expected)
|
|
s[-1] = bb_process_escape_sequence((const char **)&pp);
|
|
if (*p == '\\')
|
|
*s++ = '\\';
|
|
- if (pp == p)
|
|
+ if (pp == p) {
|
|
+ if (*p == '\0')
|
|
+ syntax_error(EMSG_UNEXP_EOS);
|
|
*s++ = *p++;
|
|
- else
|
|
+ } else
|
|
p = pp;
|
|
}
|
|
}
|
|
--
|
|
2.47.1
|
|
|