diff --git a/docs/configuration/jvm-options.md b/docs/configuration/jvm-options.md index 4255d153..2f80c5f4 100644 --- a/docs/configuration/jvm-options.md +++ b/docs/configuration/jvm-options.md @@ -163,4 +163,4 @@ MeowIce's flags use the G1 garbage collector by default. MeowIce also provides a ## Mitigating Java4Shell exploit (CVE-2026-114938) -By default the image will mitigate the Java4Shell exploit (CVE-2026-114938) by disabling `UseBASE64Intrinsics` with `-XX:-UseBASE64Intrinsics` when using Java 17 or later. This can be disabled by setting the environment variable `FIX_JAVA4SHELL_EXPLOIT` to `false`. \ No newline at end of file +The latest image now includes a base image that includes the upstream fix [listed here](https://adoptium.net/news/2026/11/temurin-november-2026-cspu-java4shell). \ No newline at end of file diff --git a/scripts/start-finalExec-jvmFlags b/scripts/start-finalExec-jvmFlags index c9189361..f9d96af5 100755 --- a/scripts/start-finalExec-jvmFlags +++ b/scripts/start-finalExec-jvmFlags @@ -233,12 +233,3 @@ if isTrue "${USE_SIMD_FLAGS}"; then --add-modules=jdk.incubator.vector " fi - -# if java >= 17, mitigate Java4Shell exploit (CVE-2026-114938) by disabling UseBASE64Intrinsics with -# -XX:-UseBASE64Intrinsics -if [[ $java_major_version -ge 17 ]] && isTrue "${FIX_JAVA4SHELL_EXPLOIT:-true}"; then - JVM_XX_OPTS="${JVM_XX_OPTS} - -XX:-UseBASE64Intrinsics - " - log "Disabling UseBASE64Intrinsics to mitigate Java4Shell exploit (CVE-2026-114938)" -fi