Repository navigation
[Backport 2.19] Bump Guava 32.1.3-jre -> 33.7.2-jre (CVE-2026-102554) - #5919
Merged
Swiddis merged 1 commit intoOct 30, 2026
Conversation
Guava >=4.0 <33.7.2 is affected by CVE-2026-102554 (GHSA-xxph-c9ww-hj94, CWE-770): CompactHashMap/CompactHashSet/MapMakerInternalMap deserialization eagerly allocates memory sized by an attacker-controlled count. Fixed in 33.7.2. Build follow-ups required on 2.19 (already present on main): - core: add compileOnlyApi jsr305, no longer a transitive dep of Guava 33.4+ (needed by prometheus for javax.annotation.Nonnull), as in opensearch-project#4714. - plugin, integ-test: force org.jspecify:jspecify:1.0.1 to resolve the version conflict introduced by Guava 33.7.2, as in opensearch-project#5776. Manual backport of opensearch-project#5918. Signed-off-by: Ajimelec Gonzalez <ajimelec@amazon.com>
AjimelecGonzalez
requested review from
Swiddis,
acarbonetto,
anirudha,
dai-chen,
joshuali925,
mengweieric,
penghuo,
ps48 and
ykmr1224
as code owners
October 30, 2026 18:28
Contributor
PR Code Analyzer ❗AI-powered 'Code-Diff-Analyzer' found issues on commit da657eb.
The table above displays the top 10 most important findings. Pull Requests Author(s): Please update your Pull Request according to the report above. Repository Maintainer(s): You can Thanks. |
ahkcs
approved these changes
Oct 30, 2026
RyanL1997
approved these changes
Oct 30, 2026
Swiddis
approved these changes
Oct 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Manual backport of #5918 to
2.19.Google Guava versions
>=4.0 <33.7.2are affected by CVE-2026-102554 (GHSA-xxph-c9ww-hj94, CWE-770 — Allocation of Resources Without Limits or Throttling), fixed in 33.7.2.CompactHashMap,CompactHashSet, andMapMakerInternalMapimplementreadObject()by reading an attacker-controlled element count / initial capacity from the stream and eagerly allocating backing arrays of that size before the actual stream content is consumed. A ~72-byte crafted serialized payload can force a multi-gigabyte allocation and crash the JVM withOutOfMemoryError.com.google.guava:guavaThe version bump is a single line in the root
build.gradle(guava_version). All modules reference${guava_version}, andplugin/integ-testforce it viaresolutionStrategy, so every module picks up the new version. The automatic backport could not be used because2.19was on32.1.3-jrerather than33.3.0-jre. Guava 33.x still supports Java 8+, so it is compatible with the branch's Java 11 target.Two build-only follow-ups were needed on
2.19thatmainalready has:core/build.gradle: addcompileOnlyApi 'com.google.code.findbugs:jsr305:3.0.2'. Guava 33.4+ no longer brings injsr305transitively, andprometheususesjavax.annotation.Nonnull. Same asmain(Bump Calcite to 1.41.0 #4714).plugin/build.gradle,integ-test/build.gradle: forceorg.jspecify:jspecify:1.0.1to resolve the 1.0.1 (from Guava 33.7.2) vs 1.0.0 conflict under strict conflict resolution. Same asmain(Fix version conflict for build #5776).No source or test changes were required.
Testing
./gradlew build -x doctest --continue(JDK 21) — BUILD SUCCESSFUL (compile, unit tests, spotless, jacoco,integTest)./gradlew compileJava compileTestJava(JDK 11) — BUILD SUCCESSFULRelated Issues
Addresses CVE-2026-102554 for the SQL plugin on
2.19. Backport of #5918.Check List
--signoffor-s.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.