busybox: 1.35.0 -> 1.36.0
PATCH v2 1/2 busybox: 1.35.0 -> 1.36.0
From: Andrej Valek <[email protected]>
- update to next (un)stable version 1.36.0
- refresh defconfig
- disable new applets (tree, tsort, seedrng)
- use hw-accel for sha1/256 sums when available
- remove and refresh already merged patches
---
v2: Rebased
...ab_1.35.0.bb => busybox-inittab_1.36.0.bb} | 0
.../0001-devmem-add-128-bit-width.patch | 128 ------------------
.../busybox/busybox/CVE-2022-30065.patch | 29 ----
meta/recipes-core/busybox/busybox/defconfig | 10 +-
.../busybox/busybox/recognize_connmand.patch | 10 +-
meta/recipes-core/busybox/busybox/sha1sum.cfg | 2 +
.../busybox/busybox/sha256sum.cfg | 1 +
.../{busybox_1.35.0.bb => busybox_1.36.0.bb} | 4 +-
8 files changed, 17 insertions(+), 167 deletions(-)
rename meta/recipes-core/busybox/{busybox-inittab_1.35.0.bb => busybox-inittab_1.36.0.bb} (100%)
delete mode 100644 meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch
delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2022-30065.patch
rename meta/recipes-core/busybox/{busybox_1.35.0.bb => busybox_1.36.0.bb} (92%)meta/recipes-core/busybox/busybox-inittab_1.36.0.bb renamed from meta/recipes-core/busybox/busybox-inittab_1.35.0.bb +0 -0
meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch deleted +0 -128
128 lines not on this page · raw message
meta/recipes-core/busybox/busybox/CVE-2022-30065.patch deleted +0 -29
@@ -1,29 +0,0 @@ -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 <[email protected]> - -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
meta/recipes-core/busybox/busybox/defconfig +8 -2
@@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Sun Dec 26 16:55:55 2021 +# Busybox version: 1.36.0 +# Tue Jan 3 14:17:01 2023 # CONFIG_HAVE_DOT_CONFIG=y
@@ -123,6 +123,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets
@@ -338,6 +341,7 @@ CONFIG_FEATURE_TR_CLASSES=y # CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y # CONFIG_TRUNCATE is not set +# CONFIG_TSORT is not set CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -831,10 +835,12 @@ CONFIG_MICROCOM=y CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +# CONFIG_SEEDRNG is not set # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set CONFIG_STRINGS=y CONFIG_TIME=y +# CONFIG_TREE is not set CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set
meta/recipes-core/busybox/busybox/recognize_connmand.patch +5 -5
@@ -4,14 +4,14 @@ Upstream-Status: Inappropriate [OE-Core] Signed-off-by: Saul Wold <[email protected]> -Index: busybox-1.22.1/networking/ifupdown.c +Index: busybox-1.36.0/networking/ifupdown.c =================================================================== ---- busybox-1.22.1.orig/networking/ifupdown.c -+++ busybox-1.22.1/networking/ifupdown.c -@@ -521,6 +521,10 @@ struct dhcp_client_t { +--- busybox-1.36.0.orig/networking/ifupdown.c ++++ busybox-1.36.0/networking/ifupdown.c +@@ -628,6 +628,10 @@ struct dhcp_client_t { }; - static const struct dhcp_client_t ext_dhcp_clients[] = { + static const struct dhcp_client_t ext_dhcp_clients[] ALIGN_PTR = { + { "connmand", + "true", + "true",
meta/recipes-core/busybox/busybox/sha1sum.cfg +2 -0
@@ -1 +1,3 @@ CONFIG_SHA1SUM=y +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y
meta/recipes-core/busybox/busybox/sha256sum.cfg +1 -0
@@ -1 +1,2 @@ CONFIG_SHA256SUM=y +CONFIG_SHA256_HWACCEL=y
meta/recipes-core/busybox/busybox_1.36.0.bb renamed from meta/recipes-core/busybox/busybox_1.35.0.bb +1 -3
@@ -49,9 +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 \ - file://0001-devmem-add-128-bit-width.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694" +SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"
Signature · 1 line
2.39.1
PATCH 2/2 busybox: Make provisions to disable sha256/sha1 accelaration on x86
busybox 1.36 has an ongoing regression on musl/i386 [1] we see same on glibc systems too.
therefore avoid the affected code by disabling sha256/sha1 sum accelaration meanwhile
CONFIG_SHA256_HWACCEL and CONFIG_SHA1_HWACCEL are enabled by default
[1] http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
---
v2: Disable sha accels on glibc/x86 as well
meta/recipes-core/busybox/busybox/sha1sum.cfg | 1 - meta/recipes-core/busybox/busybox/sha256sum.cfg | 1 - meta/recipes-core/busybox/busybox/sha_accel.cfg | 2 ++ meta/recipes-core/busybox/busybox_1.36.0.bb | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/sha_accel.cfg
meta/recipes-core/busybox/busybox/sha1sum.cfg +0 -1
@@ -1,3 +1,2 @@ CONFIG_SHA1SUM=y CONFIG_SHA1_SMALL=3 -CONFIG_SHA1_HWACCEL=y
meta/recipes-core/busybox/busybox/sha256sum.cfg +0 -1
@@ -1,2 +1 @@ CONFIG_SHA256SUM=y -CONFIG_SHA256_HWACCEL=y
meta/recipes-core/busybox/busybox/sha_accel.cfg new file +2 -0
@@ -0,0 +1,2 @@ +# CONFIG_SHA256_HWACCEL is not set +# CONFIG_SHA1_HWACCEL is not set
meta/recipes-core/busybox/busybox_1.36.0.bb +2 -1
@@ -51,5 +51,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " - +# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html +SRC_URI:append:x86 = " file://sha_accel.cfg" SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"
Signature · 1 line
2.39.1