diff --git a/CHANGELOG.md b/CHANGELOG.md index 31ffbb5d4..615705a87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ All notable changes to this project will be documented in this file. - spark-connect-client: Point grpcio to the system trust store ([#1715]). - nifi: Bump Hazelcast to `5.7.0` (partial backport of [NIFI-15942](https://issues.apache.org/jira/browse/NIFI-15942)) to fix CVE-2026-107726, for `2.6.0` and `2.9.0` ([#1737]). - superset: Bump brotli to `1.2.1` to fix CVE-2026-111497 ([#1737]). +- java-base, jdk-base: Disable the HotSpot Base64 intrinsics on amd64 via `JAVA_TOOL_OPTIONS` to mitigate CVE-2026-114938 ([#1741]). - hbase: Add `hadoop-azure` to the HBase `lib` directory again, so that `abfs://` works. This regressed in 26.7.0 with [#1511] ([#1731]). - trino: Backport [trinodb/trino#26806](https://github.com/trinodb/trino/pull/26806) to `477` to fix `appendPositions` on `RowBlockBuilder` ignoring the offset ([#1738]). @@ -205,6 +206,7 @@ All notable changes to this project will be documented in this file. [#1735]: https://github.com/stackabletech/docker-images/pull/1735 [#1737]: https://github.com/stackabletech/docker-images/pull/1737 [#1738]: https://github.com/stackabletech/docker-images/pull/1738 +[#1741]: https://github.com/stackabletech/docker-images/pull/1741 ## [26.7.0] - 2026-07-21 diff --git a/java-base/Dockerfile b/java-base/Dockerfile index 4f5eaa54e..813b802f9 100644 --- a/java-base/Dockerfile +++ b/java-base/Dockerfile @@ -60,6 +60,17 @@ ENV JAVA_VERSION=$PRODUCT_VERSION # disables the vulnerable feature ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true +# Mitigation for CVE-2026-114938 (Java4Shell) +# The HotSpot Base64 decode intrinsic in OpenJDK 17.0.6 and later can write out of bounds on +# x86-64 CPUs with AVX-512 VBMI. This disables the Base64 intrinsics on amd64, so that the JVM +# falls back to the pure Java implementation. On arm64 the variable is set, but empty. +# NOTE: The JVM logs "Picked up JAVA_TOOL_OPTIONS: ..." to stderr on every start, also when empty. +# TODO: Remove once every Temurin version we install contains the upstream fix. +ARG TARGETARCH +# "amd64" on amd64, empty on arm64 +ARG IS_AMD64=${TARGETARCH%arm64} +ENV JAVA_TOOL_OPTIONS="${IS_AMD64:+-XX:-UseBASE64Intrinsics}" + # We are adding jvmkill, as it improves shutdown of the JVM in case it runs out of native threads. # See https://github.com/stackabletech/docker-images/issues/1578 for motivation/details. COPY --chown=${STACKABLE_USER_UID}:0 --from=jvmkill-builder /stackable/libjvmkill.so /stackable/libjvmkill.so diff --git a/jdk-base/Dockerfile b/jdk-base/Dockerfile index 914ab6cf9..f13b5ab42 100644 --- a/jdk-base/Dockerfile +++ b/jdk-base/Dockerfile @@ -57,3 +57,14 @@ ENV JAVA_VERSION=$PRODUCT_VERSION # This variable is supported as of Log4j version 2.10 and # disables the vulnerable feature ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true + +# Mitigation for CVE-2026-114938 (Java4Shell) +# The HotSpot Base64 decode intrinsic in OpenJDK 17.0.6 and later can write out of bounds on +# x86-64 CPUs with AVX-512 VBMI. This disables the Base64 intrinsics on amd64, so that the JVM +# falls back to the pure Java implementation. On arm64 the variable is set, but empty. +# NOTE: The JVM logs "Picked up JAVA_TOOL_OPTIONS: ..." to stderr on every start, also when empty. +# TODO: Remove once every Temurin version we install contains the upstream fix. +ARG TARGETARCH +# "amd64" on amd64, empty on arm64 +ARG IS_AMD64=${TARGETARCH%arm64} +ENV JAVA_TOOL_OPTIONS="${IS_AMD64:+-XX:-UseBASE64Intrinsics}"