openjdk8: update to 8u252b09 (various CVEs)
CVE-2020-2754 CVE-2020-2755 CVE-2020-2756 CVE-2020-2757 CVE-2020-2773 CVE-2020-2781 CVE-2020-2800 CVE-2020-2803 CVE-2020-2805 [ci skip]
This commit is contained in:
Jürgen Buchmüller
Daniel Kolesa
parent
2d1a9de6db
commit
83f515eca1
3 changed files with 11 additions and 133 deletions
|
|
@ -1,34 +0,0 @@
|
|||
# HG changeset patch
|
||||
# User simonis
|
||||
# Date 1466155884 -7200
|
||||
# Fri Jun 17 11:31:24 2016 +0200
|
||||
# Node ID 4b40867e627dd9043bc67a4795caa9834ef69478
|
||||
# Parent 3fc29347b27fdd2075e6ec6d80bb26ab2bf667c1
|
||||
8158260, PR2991, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
|
||||
Summary: Adjust instruction generation. Includes portions of 8026049 for test case.
|
||||
Reviewed-by: goetz
|
||||
Contributed-by: gromero@linux.vnet.ibm.com, horii@jp.ibm.com
|
||||
|
||||
diff -Nru openjdk.orig/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
|
||||
--- openjdk.orig/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp 2018-03-21 09:00:58.000000000 +0000
|
||||
+++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp 2018-03-21 09:54:01.579562708 +0000
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
- * Copyright (c) 2013, Red Hat Inc.
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates.
|
||||
+ * Copyright (c) 2015, Red Hat Inc. All rights reserved.
|
||||
* All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@@ -296,6 +296,11 @@
|
||||
UsePopCountInstruction = true;
|
||||
}
|
||||
|
||||
+ // This machine allows unaligned memory accesses
|
||||
+ if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
|
||||
+ FLAG_SET_DEFAULT(UseUnalignedAccesses, true);
|
||||
+ }
|
||||
+
|
||||
if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
|
||||
UseMontgomeryMultiplyIntrinsic = true;
|
||||
}
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
Give a much bigger buffer to getmntent_r.
|
||||
|
||||
https://bugs.alpinelinux.org/issues/7093
|
||||
|
||||
diff --git a/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c b/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
|
||||
index c8500db..d0b85d6 100644
|
||||
--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
|
||||
+++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <dlfcn.h>
|
||||
#include <errno.h>
|
||||
#include <mntent.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "sun_nio_fs_LinuxNativeDispatcher.h"
|
||||
|
||||
@@ -173,8 +174,8 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this,
|
||||
jlong value, jobject entry)
|
||||
{
|
||||
struct mntent ent;
|
||||
- char buf[1024];
|
||||
- int buflen = sizeof(buf);
|
||||
+ char *buf = NULL;
|
||||
+ const size_t buflen = PATH_MAX * 4;
|
||||
struct mntent* m;
|
||||
FILE* fp = jlong_to_ptr(value);
|
||||
jsize len;
|
||||
@@ -183,10 +184,17 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this,
|
||||
char* dir;
|
||||
char* fstype;
|
||||
char* options;
|
||||
+ jint res = -1;
|
||||
|
||||
- m = getmntent_r(fp, &ent, (char*)&buf, buflen);
|
||||
- if (m == NULL)
|
||||
+ buf = malloc(buflen);
|
||||
+ if (buf == NULL) {
|
||||
+ JNU_ThrowOutOfMemoryError(env, "native heap");
|
||||
return -1;
|
||||
+ }
|
||||
+ m = getmntent_r(fp, &ent, buf, buflen);
|
||||
+ if (m == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
name = m->mnt_fsname;
|
||||
dir = m->mnt_dir;
|
||||
fstype = m->mnt_type;
|
||||
@@ -195,32 +203,35 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this,
|
||||
len = strlen(name);
|
||||
bytes = (*env)->NewByteArray(env, len);
|
||||
if (bytes == NULL)
|
||||
- return -1;
|
||||
+ goto out;
|
||||
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)name);
|
||||
(*env)->SetObjectField(env, entry, entry_name, bytes);
|
||||
|
||||
len = strlen(dir);
|
||||
bytes = (*env)->NewByteArray(env, len);
|
||||
if (bytes == NULL)
|
||||
- return -1;
|
||||
+ goto out;
|
||||
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)dir);
|
||||
(*env)->SetObjectField(env, entry, entry_dir, bytes);
|
||||
|
||||
len = strlen(fstype);
|
||||
bytes = (*env)->NewByteArray(env, len);
|
||||
if (bytes == NULL)
|
||||
- return -1;
|
||||
+ goto out;
|
||||
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)fstype);
|
||||
(*env)->SetObjectField(env, entry, entry_fstype, bytes);
|
||||
|
||||
len = strlen(options);
|
||||
bytes = (*env)->NewByteArray(env, len);
|
||||
if (bytes == NULL)
|
||||
- return -1;
|
||||
+ goto out;
|
||||
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)options);
|
||||
(*env)->SetObjectField(env, entry, entry_options, bytes);
|
||||
|
||||
- return 0;
|
||||
+ res = 0;
|
||||
+out:
|
||||
+ free(buf);
|
||||
+ return res;
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
# TODO: make -headless versions
|
||||
# TODO: config files?
|
||||
_java_ver=8
|
||||
_jdk_update=242
|
||||
_jdk_build=01
|
||||
_jdk_update=252
|
||||
_jdk_build=09
|
||||
_main_ver=${_java_ver}u${_jdk_update}
|
||||
_final_jdk_home="usr/lib/jvm/java-1.8-openjdk"
|
||||
pkgname=openjdk8
|
||||
version="${_java_ver}u${_jdk_update}b${_jdk_build}"
|
||||
revision=2
|
||||
revision=1
|
||||
# we're using aarch64 port repo to get aarch64 JIT; the repo is
|
||||
# otherwise the same as the normal one, just with aarch64 port added
|
||||
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
|
||||
|
|
@ -52,14 +52,14 @@ distfiles="
|
|||
http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
|
||||
http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
|
||||
|
||||
checksum="f251afdc71f252c4d2559f9d49cbce3128ffcba2185b5d3a0e7020d5d214bab7
|
||||
27590eaa48dcddaf9a8aa305333b5e619acede415f7a091afd9cca8fd69ccf85
|
||||
af73a2b1a6bf2d59e5c2cb87253844c2969489f37ac6ad352c60599ea8a7e116
|
||||
7ecb436b63feceec86b0aefca3b95e2b03d08503a26233b0d5f09441826925db
|
||||
93bbcdfa489d4e5b68a7ccc5faf92ef74ea5ac5b2e3f93314158ea50624fd1c2
|
||||
6bd28277bb73c29d189c70ca2d61263e698406d89e54403c09f19a4e852a703a
|
||||
287d716a3f4ecd8a7c2e579a7514a0998c0164f544084cc90d8a476813663904
|
||||
e272f22edc8f43c4c2dfcce6073b7689332a05014ead734dff24537a49e23682"
|
||||
checksum="92c682ee19844341a21853c7db8bd7654d2e6e50a4c8d630b6b6be34c2591341
|
||||
5ced6b56b60a658c04092ee6152462b4f3f84465b654f4bc874f03a2bc6539fb
|
||||
255a113a1a299caef89b928ebcdb6964f0e63009089a07c162562beb20aa42c8
|
||||
ec9a858770e348fe60817a67e670e268fb2445d64f99b6d4d33556f4e2f0c1d1
|
||||
96ae2b2362f3d45874247b11bd8df59914fbfab051513e908eda11bb71a5837b
|
||||
de5fe5813d47092e048f6860dc58dad8a2dbd2b9e7272493cff78cd7ad7aa82d
|
||||
a971f578c3d8550f0b96b01ac24fc408cdcc7f2923d530d5ada81bba8caef9fe
|
||||
02d4042b042c457b0ed41cc6c95cfe005badec55b5fc19f03f57aebbc7121e52"
|
||||
|
||||
build_options="docs"
|
||||
desc_option_docs="Build documentation"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue