Skip to content

deps: backport Brotli CVE-2026-111497 fix to Node 22.21.1 - #26

Closed
heckerdavid wants to merge 3 commits into
Asana:v22.21.1from
heckerdavid:davidhecker/node22-brotli-cve-2026-111497
Closed

heckerdavid wants to merge 3 commits into
Asana:v22.21.1from
heckerdavid:davidhecker/node22-brotli-cve-2026-111497

Conversation

@heckerdavid

Copy link
Copy Markdown

Backport the published fix for CVE-2026-111497 onto Asana's Node 22.21.1 fork. Invalid Brotli block switches now produce the expected decoder error. The runtime remains 22.21.1; V8, fiber compatibility patches, module ABI 127, and the standard/FIPS Dockerfiles are unchanged.

This includes upstream Node commits 67d294739f and a18ec92752, including the synchronous and streaming regression test. The test-file conflict was resolved by adding only the Brotli regression block, without unrelated tests introduced in intervening upstream releases.

The branch starts from 0f26935ba387. A separate CI commit keeps feature-branch binaries in their Actions run artifacts and prevents them from replacing the shared 22.21.1 GitHub release assets.

Validation completed:

  • Diff whitespace check and JavaScript syntax check.
  • Repository ESLint on the changed JavaScript test.
  • Repository C++ lint and import checks on src/node_zlib.cc.
  • Standalone vendored-decoder regression under AddressSanitizer and UndefinedBehaviorSanitizer: all 22 input chunk sizes return the expected block-switch error (-17), with no sanitizer diagnostics. The baseline decoder fails that assertion in all 22 cases, returning error -9 instead. This check does not validate the complete Node binding or production packaging.

This is a draft. The full local macOS arm64 runtime build is still running. Runtime regression tests, fiber compatibility checks, Linux x64/arm64 standard and FIPS builds, packaged-runtime smoke tests, and the full upstream test suite remain outstanding.

eustas and others added 3 commits October 23, 2026 14:08
Original commit message:

  Detect and report invalid stream earlier.

  PiperOrigin-RevId: 876198329

PR-URL: https://github.com/nodejs-private/node-private/pull/1002
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
CVE-ID: CVE-2026-111497
(cherry picked from commit 67d2947)
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs-private/node-private/pull/1002
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
CVE-ID: CVE-2026-111497
(cherry picked from commit a18ec92)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants