mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
busybox: Add fix for CVE-2023-42366
(From OE-Core rev: 25554f0a542894416ad17e1334c8a05feb56b12e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -0,0 +1,37 @@
|
|||||||
|
From 8542236894a8d5f7393327117bc7f64787444efc 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>
|
||||||
|
---
|
||||||
|
editors/awk.c | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/editors/awk.c b/editors/awk.c
|
||||||
|
index f320d8c..a53b193 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,6 +55,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
|||||||
file://CVE-2023-42363.patch \
|
file://CVE-2023-42363.patch \
|
||||||
file://0001-awk-fix-precedence-of-relative-to.patch \
|
file://0001-awk-fix-precedence-of-relative-to.patch \
|
||||||
file://0002-awk-fix-ternary-operator-and-precedence-of.patch \
|
file://0002-awk-fix-ternary-operator-and-precedence-of.patch \
|
||||||
|
file://0001-awk.c-fix-CVE-2023-42366-bug-15874.patch \
|
||||||
"
|
"
|
||||||
SRC_URI:append:libc-musl = " file://musl.cfg "
|
SRC_URI:append:libc-musl = " file://musl.cfg "
|
||||||
# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
|
# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
|
||||||
|
|||||||
Reference in New Issue
Block a user