From patchwork Thu Jan 26 21:46:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18714 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 224F6C61D97 for ; Thu, 26 Jan 2023 21:46:56 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.87369.1674769609606658393 for ; Thu, 26 Jan 2023 13:46:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Btg6ZO7/; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id v23so3127335plo.1 for ; Thu, 26 Jan 2023 13:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TFTvkaWrT/Cc104F5nFQ62QvAVMCPCu25+TylsXTWo4=; b=Btg6ZO7/LHw5m4Hstl02761n6dRIcWaQ+PrnzFu742chOrfsnJBRjGuud65dBadCtc lS3l+tQbDODv7H4ytAjny37caIrANlSNXvpXFdPHTcs0hOj0enILOmMOt035drmKkuzu WMRCrshn2b10sIbY/HoacfqAKSRUeAIxAt0GLrdmHSf/7KKdBuVeVOwt77c9HDYQkiBO CmrDOkhvZAyDauUDx4sLU+9uy4o5IjDXibml2OkMuV+c/M1t71YvGLrlww/mRALRkod1 yLcSxiqh8zAyU7Me1LJY5EFgLz9SkICa+tEqchUhzM1ArW1+Oad00DNIg3yeVIZWS2ro YapA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TFTvkaWrT/Cc104F5nFQ62QvAVMCPCu25+TylsXTWo4=; b=pucEg3PYi/evnBkjLDJl/mt0UQL63AysDtzCuXeiX+DHgg8puWWMdOeu0TMGBoF4pt 94h1k6WipeMIJw5comfO3ZNf6MPCdGntoCY8QhAb3cNbSmJeBMP7KHtUWC6p4B0pEMM5 lyHSKidTKKCFPI5t10BeKjCp3NySxqmKvHTsqDA7gssgXjGdAgSg/JJpKBzAYa4iAGNM CrZSeG9nvP0SX2zMeiZQJLYO2Hz2hdxg+2UqlLOnxc7qguKiIAeKqxv3n30xfxp4vMh/ CyOTtNhinQqnK8bTqr/ZSYWz0prgOa/G5RcULbk5TguNmXEWLYNomavw4AC626NRY4z0 zCcw== X-Gm-Message-State: AFqh2kpaCW7FwBYGmeGFjNtDtiydsl22LJJRxj+qF63NMZMFweNiOy1D Nm+hnXZtPfS5T0yGKeb+O1Wq3mgCG+p6yg== X-Google-Smtp-Source: AMrXdXvqk1ww7A7XAP1GXr9o34GfUwtfRFXBpmCU69hw42goi52ZmxvtwxOM9OZ8F+Y7L5rm0IKRkQ== X-Received: by 2002:a17:902:eb8c:b0:189:8425:730d with SMTP id q12-20020a170902eb8c00b001898425730dmr33008297plg.27.1674769608680; Thu, 26 Jan 2023 13:46:48 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id z1-20020a1709028f8100b001888cadf8f6sm1444496plo.49.2023.01.26.13.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 13:46:48 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Andrej Valek , Khem Raj Subject: [PATCH v2 1/2] busybox: 1.35.0 -> 1.36.0 Date: Thu, 26 Jan 2023 13:46:45 -0800 Message-Id: <20230126214646.3279607-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 26 Jan 2023 21:46:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176428 From: Andrej Valek - 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 Signed-off-by: Andrej Valek Signed-off-by: Khem Raj --- 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%) diff --git a/meta/recipes-core/busybox/busybox-inittab_1.35.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb similarity index 100% rename from meta/recipes-core/busybox/busybox-inittab_1.35.0.bb rename to meta/recipes-core/busybox/busybox-inittab_1.36.0.bb diff --git a/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch b/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch deleted file mode 100644 index 985e2bf1d9..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch +++ /dev/null @@ -1,128 +0,0 @@ -From d432049f288c9acdc4a7caa729c68ceba3c5dca1 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen -Date: Thu, 25 Aug 2022 18:47:02 +0300 -Subject: [PATCH] devmem: add 128-bit width - -Add 128-bit width if the compiler provides the needed type. - -function old new delta -devmem_main 405 464 +59 -.rodata 109025 109043 +18 ------------------------------------------------------------------------------- -(add/remove: 0/0 grow/shrink: 2/0 up/down: 77/0) Total: 77 bytes - -Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=d432049f288c9acdc4a7caa729c68ceba3c5dca1] - -Signed-off-by: Aaro Koskinen -Signed-off-by: Aaro Koskinen -Signed-off-by: Denys Vlasenko -Signed-off-by: Mingli Yu ---- - miscutils/devmem.c | 68 ++++++++++++++++++++++++++++++---------------- - 1 file changed, 44 insertions(+), 24 deletions(-) - -diff --git a/miscutils/devmem.c b/miscutils/devmem.c -index f9f0276bc..f21621bd6 100644 ---- a/miscutils/devmem.c -+++ b/miscutils/devmem.c -@@ -29,7 +29,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - { - void *map_base, *virt_addr; - uint64_t read_result; -- uint64_t writeval = writeval; /* for compiler */ - off_t target; - unsigned page_size, mapped_size, offset_in_page; - int fd; -@@ -64,9 +63,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - width = strchrnul(bhwl, (argv[2][0] | 0x20)) - bhwl; - width = sizes[width]; - } -- /* VALUE */ -- if (argv[3]) -- writeval = bb_strtoull(argv[3], NULL, 0); - } else { /* argv[2] == NULL */ - /* make argv[3] to be a valid thing to fetch */ - argv--; -@@ -96,28 +92,46 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - virt_addr = (char*)map_base + offset_in_page; - - if (!argv[3]) { -- switch (width) { -- case 8: -- read_result = *(volatile uint8_t*)virt_addr; -- break; -- case 16: -- read_result = *(volatile uint16_t*)virt_addr; -- break; -- case 32: -- read_result = *(volatile uint32_t*)virt_addr; -- break; -- case 64: -- read_result = *(volatile uint64_t*)virt_addr; -- break; -- default: -- bb_simple_error_msg_and_die("bad width"); -+#ifdef __SIZEOF_INT128__ -+ if (width == 128) { -+ unsigned __int128 rd = -+ *(volatile unsigned __int128 *)virt_addr; -+ printf("0x%016llX%016llX\n", -+ (unsigned long long)(uint64_t)(rd >> 64), -+ (unsigned long long)(uint64_t)rd -+ ); -+ } else -+#endif -+ { -+ switch (width) { -+ case 8: -+ read_result = *(volatile uint8_t*)virt_addr; -+ break; -+ case 16: -+ read_result = *(volatile uint16_t*)virt_addr; -+ break; -+ case 32: -+ read_result = *(volatile uint32_t*)virt_addr; -+ break; -+ case 64: -+ read_result = *(volatile uint64_t*)virt_addr; -+ break; -+ default: -+ bb_simple_error_msg_and_die("bad width"); -+ } -+// printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n", -+// target, virt_addr, -+// (unsigned long long)read_result); -+ /* Zero-padded output shows the width of access just done */ -+ printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result); - } --// printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n", --// target, virt_addr, --// (unsigned long long)read_result); -- /* Zero-padded output shows the width of access just done */ -- printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result); - } else { -+ /* parse VALUE */ -+#ifdef __SIZEOF_INT128__ -+ unsigned __int128 writeval = strtoumax(argv[3], NULL, 0); -+#else -+ uint64_t writeval = bb_strtoull(argv[3], NULL, 0); -+#endif - switch (width) { - case 8: - *(volatile uint8_t*)virt_addr = writeval; -@@ -135,6 +149,12 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - *(volatile uint64_t*)virt_addr = writeval; - // read_result = *(volatile uint64_t*)virt_addr; - break; -+#ifdef __SIZEOF_INT128__ -+ case 128: -+ *(volatile unsigned __int128 *)virt_addr = writeval; -+// read_result = *(volatile uint64_t*)virt_addr; -+ break; -+#endif - default: - bb_simple_error_msg_and_die("bad width"); - } --- -2.25.1 - diff --git a/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch b/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch deleted file mode 100644 index 25ad653b25..0000000000 --- a/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch +++ /dev/null @@ -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 - -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 diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 5e1e1f5638..3d36447c63 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -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 diff --git a/meta/recipes-core/busybox/busybox/recognize_connmand.patch b/meta/recipes-core/busybox/busybox/recognize_connmand.patch index f42c74caad..4f28beb556 100644 --- a/meta/recipes-core/busybox/busybox/recognize_connmand.patch +++ b/meta/recipes-core/busybox/busybox/recognize_connmand.patch @@ -4,14 +4,14 @@ Upstream-Status: Inappropriate [OE-Core] Signed-off-by: Saul Wold -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", diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/meta/recipes-core/busybox/busybox/sha1sum.cfg index 20e72d9263..01137a2486 100644 --- a/meta/recipes-core/busybox/busybox/sha1sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha1sum.cfg @@ -1 +1,3 @@ CONFIG_SHA1SUM=y +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha256sum.cfg b/meta/recipes-core/busybox/busybox/sha256sum.cfg index ce652ae4c6..a5b0ab22d1 100644 --- a/meta/recipes-core/busybox/busybox/sha256sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha256sum.cfg @@ -1 +1,2 @@ CONFIG_SHA256SUM=y +CONFIG_SHA256_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox_1.35.0.bb b/meta/recipes-core/busybox/busybox_1.36.0.bb similarity index 92% rename from meta/recipes-core/busybox/busybox_1.35.0.bb rename to meta/recipes-core/busybox/busybox_1.36.0.bb index e9ca6fdb1a..e46d43e681 100644 --- a/meta/recipes-core/busybox/busybox_1.35.0.bb +++ b/meta/recipes-core/busybox/busybox_1.36.0.bb @@ -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" From patchwork Thu Jan 26 21:46:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DF0AC05027 for ; Thu, 26 Jan 2023 21:46:56 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.87535.1674769610533966928 for ; Thu, 26 Jan 2023 13:46:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NuywzH0i; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id h5-20020a17090a9c0500b0022bb85eb35dso3031346pjp.3 for ; Thu, 26 Jan 2023 13:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uhVwHd3qgqZ9T1RPk7XtYd6axZ4tJiWqeVsUph3+2ec=; b=NuywzH0is4YjiADtSpizqAkvlof6S2jhPPzoXeLsupj0fxWC4yhNfM3GkOmqDYz+O1 nO1JcrXVlFT/bw0OCYd5ugeMoXq+7ztbQ5YNx/Bal09q9MnYN7GhYf9JzkaotTnVS7vt ZMbSjhxdPI7zMdNJkR1wOnftUPMZSFr0weHl6Q2yxdm9keXFBdi1bqQHK4rm92MGzr0f Nyl6Rj/dKmIGm+lFharnJsQfNUQX+G+qzzdEjMr12bb94sHizpSb4uGPYaxCZeITCqSk WCEUDEhDgIdbo9ou2YrKuTFtxfSA7rTVsOAyebAdenPf9/4ZNBOjP0P16rhvwIzTG6bE +KTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uhVwHd3qgqZ9T1RPk7XtYd6axZ4tJiWqeVsUph3+2ec=; b=tW9TwNa6dPVatwVJIb2dKLMIaOIAAEaSEY2dRTSgD6Ng+rdsO1MyMui14+XgzGO/4S /m+oHu9xM303S0ULROmpjkvzTDVNvI0Slhhovf9gtTmB/WFWuktOv8YUY8SbxbP598Qh gNhkxP7mEEL2PgXR3lc8KY3jrMJ31y7R9gjyKodITbLyaqGeMqwHIW6IndcRDYZ8JLdg hIEEPAlVH6C/M0xn/VqPVXJa3fgsFE3fA8YHehrrieeXupgQwevIuE8u4KpiBGtnWF9j 4vmYYPMoHRH7cAKycvhpfWwwPOBufSov+NagnGytGgTajBebZcbQK+tdhqeXv0OrF4um gaoA== X-Gm-Message-State: AFqh2koM03slVNJpaxcaUQbuim9GwRaiW9Q9CbSg8EeK7WHuAqAx3bIF iRbQ3HOFkId1OWj92Iw85/TJE6sFmLJhbQ== X-Google-Smtp-Source: AMrXdXsmR6gOUV7SZAYz3XIfOIzqXzhu1B94/vVC0DBT5JE77IOKwAR1F2o5xDEWYDYTrQoqkwvRGg== X-Received: by 2002:a17:903:1cb:b0:194:d8b2:7a1b with SMTP id e11-20020a17090301cb00b00194d8b27a1bmr34823498plh.68.1674769609606; Thu, 26 Jan 2023 13:46:49 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id z1-20020a1709028f8100b001888cadf8f6sm1444496plo.49.2023.01.26.13.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 13:46:49 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Andrej Valek Subject: [PATCH 2/2] busybox: Make provisions to disable sha256/sha1 accelaration on x86 Date: Thu, 26 Jan 2023 13:46:46 -0800 Message-Id: <20230126214646.3279607-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126214646.3279607-1-raj.khem@gmail.com> References: <20230126214646.3279607-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 26 Jan 2023 21:46:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176429 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 Signed-off-by: Khem Raj Cc: Andrej Valek --- 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 diff --git a/meta/recipes-core/busybox/busybox/sha1sum.cfg b/meta/recipes-core/busybox/busybox/sha1sum.cfg index 01137a2486..afd4da4ea1 100644 --- a/meta/recipes-core/busybox/busybox/sha1sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha1sum.cfg @@ -1,3 +1,2 @@ CONFIG_SHA1SUM=y CONFIG_SHA1_SMALL=3 -CONFIG_SHA1_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha256sum.cfg b/meta/recipes-core/busybox/busybox/sha256sum.cfg index a5b0ab22d1..ce652ae4c6 100644 --- a/meta/recipes-core/busybox/busybox/sha256sum.cfg +++ b/meta/recipes-core/busybox/busybox/sha256sum.cfg @@ -1,2 +1 @@ CONFIG_SHA256SUM=y -CONFIG_SHA256_HWACCEL=y diff --git a/meta/recipes-core/busybox/busybox/sha_accel.cfg b/meta/recipes-core/busybox/busybox/sha_accel.cfg new file mode 100644 index 0000000000..8900305a11 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/sha_accel.cfg @@ -0,0 +1,2 @@ +# CONFIG_SHA256_HWACCEL is not set +# CONFIG_SHA1_HWACCEL is not set diff --git a/meta/recipes-core/busybox/busybox_1.36.0.bb b/meta/recipes-core/busybox/busybox_1.36.0.bb index e46d43e681..8014a5c7bf 100644 --- a/meta/recipes-core/busybox/busybox_1.36.0.bb +++ b/meta/recipes-core/busybox/busybox_1.36.0.bb @@ -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"