1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

busybox: fix CVE-2022-30065

(From OE-Core rev: aacc1091d8d17b817c6ad1108d9ab44b234bc08e)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bf3d981b0303eab91d4cb19092ac27b489c8ad27)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-06-28 14:29:34 +01:00
committed by Richard Purdie
parent fcfda2b40e
commit 0014fd43f3
2 changed files with 30 additions and 0 deletions
@@ -0,0 +1,29 @@
Fix use-after-free in awk.
CVE: CVE-2022-30065
Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2022-June/089768.html]
Signed-off-by: Ross Burton <ross.burton@arm.com>
fixes https://bugs.busybox.net/show_bug.cgi?id=14781
Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>
---
editors/awk.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/editors/awk.c b/editors/awk.c
index 079d0bde5..728ee8685 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -3128,6 +3128,9 @@ static var *evaluate(node *op, var *res)
case XC( OC_MOVE ):
debug_printf_eval("MOVE\n");
+ /* make sure that we never return a temp var */
+ if (L.v == TMPVAR0)
+ L.v = res;
/* if source is a temporary string, jusk relink it to dest */
if (R.v == TMPVAR1
&& !(R.v->type & VF_NUMBER)
--
2.36.1
@@ -49,6 +49,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \
file://0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch \
file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \
file://CVE-2022-30065.patch \
"
SRC_URI:append:libc-musl = " file://musl.cfg "