From 99c51751b6542f703dea7179a7b9c78b024d2cb9 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Nov 2026 15:38:02 +0100 Subject: [PATCH 1/2] fix(opensearch): Pass the Base64 intrinsics mitigation via jvm.options.d --- CHANGELOG.md | 1 + opensearch/Dockerfile | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 615705a87..6e534c301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,6 +117,7 @@ All notable changes to this project will be documented in this file. - 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]). +- opensearch: Disable the HotSpot Base64 intrinsics on amd64 via `jvm.options.d`, as OpenSearch ignores `JAVA_TOOL_OPTIONS` ([#XXXX]). - 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]). diff --git a/opensearch/Dockerfile b/opensearch/Dockerfile index bd6e79fcd..5640a68b4 100644 --- a/opensearch/Dockerfile +++ b/opensearch/Dockerfile @@ -142,6 +142,14 @@ rm -r jdk "org.opensearch.plugin:opensearch-ubi:${OPENSEARCH_UBI_PLUGIN_VERSION}" \ "org.opensearch.plugin:query-insights:${QUERY_INSIGHTS_PLUGIN_VERSION}" +# Mitigation for CVE-2026-114938 (Java4Shell), see jdk-base/Dockerfile. +# OpenSearch ignores JAVA_TOOL_OPTIONS (see bin/opensearch-env), so the flag set in jdk-base has +# no effect here. It is passed via jvm.options.d instead, only on amd64. +# TODO: Remove together with the mitigation in jdk-base, see https://github.com/stackabletech/docker-images/pull/1741 +if [ "${TARGETARCH}" = "amd64" ]; then + echo "-XX:-UseBASE64Intrinsics" > config/jvm.options.d/cve-2026-114938.options +fi + # Change the group permissions already in the builder image to reduce # the size of the final image. # see https://github.com/stackabletech/docker-images/issues/961 From 077f76d49731b1441385f458933c4e144398f819 Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Nov 2026 15:40:48 +0100 Subject: [PATCH 2/2] chore: changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e534c301..7a18a34aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,7 +117,7 @@ All notable changes to this project will be documented in this file. - 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]). -- opensearch: Disable the HotSpot Base64 intrinsics on amd64 via `jvm.options.d`, as OpenSearch ignores `JAVA_TOOL_OPTIONS` ([#XXXX]). +- opensearch: Disable the HotSpot Base64 intrinsics on amd64 via `jvm.options.d`, as OpenSearch ignores `JAVA_TOOL_OPTIONS` ([#1745]). - 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]). @@ -208,6 +208,7 @@ All notable changes to this project will be documented in this file. [#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 +[#1745]: https://github.com/stackabletech/docker-images/pull/1745 ## [26.7.0] - 2026-07-21