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 = " \