From 3c284dcb726ff6599d3b87fb366fb04411cf5595 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 17 Jun 2022 09:52:11 +0000 Subject: [PATCH 1/2] awk: fix use after free (CVE-2022-30065) fixes https://bugs.busybox.net/show_bug.cgi?id=14781 Signed-off-by: Natanael Copa --- 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 From 30c8f8e69230ef27f116a2c10ca2e4a6cc343dad Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 16 Jun 2022 21:54:48 +0200 Subject: [PATCH 2/2] awk: add tests for CVE-2022-30065 Signed-off-by: Natanael Copa --- testsuite/awk.tests | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/testsuite/awk.tests b/testsuite/awk.tests index 93e25d8c1..6c3a03c37 100755 --- a/testsuite/awk.tests +++ b/testsuite/awk.tests @@ -479,4 +479,15 @@ testing 'awk backslash+newline eaten with no trace' \ "Hello world\n" \ '' '' +testing 'awk use-after-free (CVE-2022-30065)' \ + "awk '\$3i\$3in\$9=\$r||\$9=i6/6-9f'" \ + "" \ + "" \ + "" + +testing 'awk assign while test' \ + "awk '\$1==\$1=\"foo\" {print \$1}'" \ + "foo\n" \ + "" \ + "foo" exit $FAILCOUNT -- 2.36.1