Open Build Service

Changes of Revision 11

_service:tar_scm_kernel_repo:busybox.spec Changed

_service:tar_scm_kernel_repo:backport-CVE-2022-30065.patch Added

@@ -0,0 +1,46 @@
+From 4ec641f81717e19198fc6375cf06b514ac381ab9 Mon Sep 17 00:00:00 2001
+From: jackey_1024 <jikui2@huawei.com>
+Date: Sat, 20 Aug 2022 18:07:04 +0800
+Subject: [PATCH] busybox: fix CVE-2022-30065
+
+backport from upstream:
+https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e
+
+Signed-off-by: jackey_1024 <jikui2@huawei.com>
+---
+ editors/awk.c       | 3 +++
+ testsuite/awk.tests | 6 ++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 62cd019..66d2646 100644
+--- a/editors/awk.c
++++ b/editors/awk.c
+@@ -3094,6 +3094,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)
+diff --git a/testsuite/awk.tests b/testsuite/awk.tests
+index 64ca9fd..2200488 100755
+--- a/testsuite/awk.tests
++++ b/testsuite/awk.tests
+@@ -463,4 +463,10 @@ testing "awk \"cmd\" | getline" \
+ 	"HELLO\n" \
+ 	'' ''
+ 
++testing 'awk assign while test' \
++	"awk '\$1==\$1=\"foo\" {print \$1}'" \
++	"foo\n" \
++	"" \
++	"foo"
++
+ exit $FAILCOUNT
+-- 
+2.25.1
+