From patchwork Mon Apr 28 13:25:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeroen Hofstee X-Patchwork-Id: 62028 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 12F69C369DC for ; Mon, 28 Apr 2025 14:37:30 +0000 (UTC) Received: from outbound0.mail.transip.nl (outbound0.mail.transip.nl [149.210.149.69]) by mx.groups.io with SMTP id smtpd.web11.48150.1745846737717809229 for ; Mon, 28 Apr 2025 06:25:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@myspectrum.nl header.s=transip-a header.b=XfPGyljn; spf=pass (domain: myspectrum.nl, ip: 149.210.149.69, mailfrom: jeroen@myspectrum.nl) Received: from submission11.mail.transip.nl (unknown [10.103.8.162]) by outbound0.mail.transip.nl (Postfix) with ESMTP id 4ZmPMg1z0FzxPYk; Mon, 28 Apr 2025 15:25:35 +0200 (CEST) Received: from yellow.myspectrum.nl (unknown [IPv6:2a01:7c8:bb0c:45:5054:ff:fe01:854]) by submission11.mail.transip.nl (Postfix) with ESMTPSA id 4ZmPMf18zWz2pRDyB; Mon, 28 Apr 2025 15:25:34 +0200 (CEST) Received: from yellow.myspectrum.nl (84-27-20-154.cable.dynamic.v4.ziggo.nl [84.27.20.154]) (Authenticated sender: sendmail@myspectrum.nl) by yellow.myspectrum.nl (Postfix) with ESMTPSA id A79532002A; Mon, 28 Apr 2025 13:25:28 +0000 (UTC) Authentication-Results: yellow.myspectrum.nl; auth=pass smtp.auth=sendmail@myspectrum.nl smtp.mailfrom=jeroen@myspectrum.nl Received: by yellow.myspectrum.nl (sSMTP sendmail emulation); Mon, 28 Apr 2025 15:25:27 +0200 From: jeroen@myspectrum.nl To: openembedded-devel@lists.openembedded.org Cc: Jason Schonberg , Jeroen Hofstee Subject: [meta-oe][PATCH] nodejs: backport a patch to prevent brotli crashing nodejs Date: Mon, 28 Apr 2025 15:25:07 +0200 Message-ID: <20250428132509.729516-1-jeroen@myspectrum.nl> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Scanned-By: ClueGetter at submission11.mail.transip.nl DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=transip-a; d=myspectrum.nl; t=1745846734; h=from:subject:to:cc:date: mime-version:content-type; bh=MrqsBBRvFyUBjUNMfy7lntiJxUp2Wsq/cvKG8ZXUboY=; b=XfPGyljnnUZcM9KRi7fgWytFKkZlpSQFe+JlVtFIqHkS6fxi5X9Ha7evp8r7xc1SFvJsw9 ytOu5meBkwpAQ8+WRVft5BULEA3MDuk3qg72UIdDI05/SW3bFEly0Fyc/O7sUz8khVdsfN l5KgPh0ZaNMVxn6lxchYK0+CbKEVS8BJII6Fzbfkn7fQ4RbkjMIS+nUJcnY9vdNfcNdcAM wSBlXVDMQmcuG2saf1Js3hcdvGav2f3LXPYXJIu7P/WdvLFuju8u3weby7S49bKssYT9zx JhU6BeJQRdKhs7664Sq+FqMpC/4VMq/TVb4D1KlZXM/gGaFRJthfMJzOPJybqg== X-Report-Abuse-To: abuse@transip.nl 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 ; Mon, 28 Apr 2025 14:37:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117198 From: Jeroen Hofstee Brotli can crash nodejs (on ARM), because the memory allocated for brotli wasn't properly aligned. https://github.com/google/brotli/issues/1159 https://github.com/nodejs/node/commit/dc035bbc9b310ff8067bc0dad22230978489c061 Signed-off-by: Jeroen Hofstee --- .../nodejs/zlib-fix-pointer-alignment.patch | 64 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_22.15.0.bb | 1 + 2 files changed, 65 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch b/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch new file mode 100644 index 0000000000..e372911193 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch @@ -0,0 +1,64 @@ +From dc035bbc9b310ff8067bc0dad22230978489c061 Mon Sep 17 00:00:00 2001 +From: jhofstee +Date: Wed, 9 Apr 2025 12:24:13 +0200 +Subject: [PATCH] zlib: fix pointer alignment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The function AllocForBrotli prefixes the allocated memory with its +size, and returns a pointer to the region after it. This pointer can +however no longer be suitably aligned. Correct this by allocating +the maximum of the the size of the size_t and the max alignment. + +On Arm 32bits the size_t is 4 bytes long, but the alignment is 8 for +some NEON instructions. When Brotli is compiled with optimizations +enabled newer GCC versions will use the NEON instructions and trigger +a bus error killing node. + +see https://github.com/google/brotli/issues/1159 + +PR-URL: https://github.com/nodejs/node/pull/57727 +Reviewed-By: Shelley Vohr +Reviewed-By: Tobias Nießen +Reviewed-By: Daniel Lemire +Reviewed-By: Gerhard Stöbich + +Upstream-Status: Backport [https://github.com/nodejs/node/commit/dc035bbc9b310ff8067bc0dad22230978489c061] +--- + src/node_zlib.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/node_zlib.cc b/src/node_zlib.cc +index 0b7c47b326c7c5..7e6b38ecd1aa36 100644 +--- a/src/node_zlib.cc ++++ b/src/node_zlib.cc +@@ -608,7 +608,8 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { + } + + static void* AllocForBrotli(void* data, size_t size) { +- size += sizeof(size_t); ++ constexpr size_t offset = std::max(sizeof(size_t), alignof(max_align_t)); ++ size += offset; + CompressionStream* ctx = static_cast(data); + char* memory = UncheckedMalloc(size); + if (memory == nullptr) [[unlikely]] { +@@ -617,7 +618,7 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { + *reinterpret_cast(memory) = size; + ctx->unreported_allocations_.fetch_add(size, + std::memory_order_relaxed); +- return memory + sizeof(size_t); ++ return memory + offset; + } + + static void FreeForZlib(void* data, void* pointer) { +@@ -625,7 +626,8 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { + return; + } + CompressionStream* ctx = static_cast(data); +- char* real_pointer = static_cast(pointer) - sizeof(size_t); ++ constexpr size_t offset = std::max(sizeof(size_t), alignof(max_align_t)); ++ char* real_pointer = static_cast(pointer) - offset; + size_t real_size = *reinterpret_cast(real_pointer); + ctx->unreported_allocations_.fetch_sub(real_size, + std::memory_order_relaxed); diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.15.0.bb index 07ea8c083d..68c96cc1fb 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.15.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.15.0.bb @@ -29,6 +29,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-deps-disable-io_uring-support-in-libuv.patch \ file://0001-positional-args.patch \ file://0001-custom-env.patch \ + file://zlib-fix-pointer-alignment.patch \ file://run-ptest \ " SRC_URI:append:class-target = " \