/hg/release/icedtea6-1.10: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 2 12:43:15 PST 2011
changeset 767e82690eb3 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=767e82690eb3
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 19:47:16 2011 +0000
Apply 6878713 security fix to hs20 builds.
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Apply 6878713 for hs20 which still
doesn't have it. Make HotSpot conditional patching
clearer.
* patches/security/20110215/6878713.patch: Readded.
changeset 9f4eced56544 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=9f4eced56544
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 20:42:48 2011 +0000
Allow parallel (-jx) builds of IcedTea by explicitly passing -j1 to
the underlying OpenJDK build.
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (icedtea): Explicitly set -j1 for the
legacy OpenJDK build as it can't handle parallelism
correctly. This allows the main IcedTea build to be
parallel while still allowing OpenJDK to build.
(icedtea-debug): Likewise. (icedtea-ecj): Likewise.
changeset 6e809b822ad1 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=6e809b822ad1
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 20:43:02 2011 +0000
Added tag icedtea6-1.10 for changeset 9f4eced56544
diffstat:
3 files changed, 84 insertions(+)
ChangeLog | 11 ++++
Makefile.am | 2
patches/security/20110215/6878713.patch | 71 +++++++++++++++++++++++++++++++
diffs (245 lines):
diff -r a652f386460b -r 6e809b822ad1 .hgtags
--- a/.hgtags Wed Mar 02 19:26:46 2011 +0000
+++ b/.hgtags Wed Mar 02 20:43:02 2011 +0000
@@ -20,3 +20,4 @@ 9420faca6468e1c75e9bfa73b31246ba0b73a77d
9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint
cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint
21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branch
+9f4eced56544b0326bb5aa011de6263ca121c7c1 icedtea6-1.10
diff -r a652f386460b -r 6e809b822ad1 ChangeLog
--- a/ChangeLog Wed Mar 02 19:26:46 2011 +0000
+++ b/ChangeLog Wed Mar 02 20:43:02 2011 +0000
@@ -1,3 +1,23 @@ 2011-03-02 Andrew John Hughes <ahughes
+2011-03-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (icedtea): Explicitly set -j1 for the
+ legacy OpenJDK build as it can't handle
+ parallelism correctly. This allows the
+ main IcedTea build to be parallel while
+ still allowing OpenJDK to build.
+ (icedtea-debug): Likewise.
+ (icedtea-ecj): Likewise.
+
+2011-03-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Apply 6878713 for hs20 which still doesn't
+ have it. Make HotSpot conditional patching
+ clearer.
+ * patches/security/20110215/6878713.patch:
+ Readded.
+
2011-03-02 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r a652f386460b -r 6e809b822ad1 Makefile.am
--- a/Makefile.am Wed Mar 02 19:26:46 2011 +0000
+++ b/Makefile.am Wed Mar 02 20:43:02 2011 +0000
@@ -188,6 +188,11 @@ ICEDTEA_FSG_PATCHES =
SECURITY_PATCHES =
+if WITH_ALT_HSBUILD
+SECURITY_PATCHES += \
+ patches/security/20110215/6878713.patch
+endif
+
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
patches/stdc-limit-macros.patch \
@@ -320,15 +325,15 @@ ICEDTEA_PATCHES = \
patches/pr600-arm-jvm.cfg.patch \
patches/jaxp-serial-version-uid.patch
-if !WITH_ALT_HSBUILD
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/pr639-broken_shark_build.patch \
+ patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
+else
ICEDTEA_PATCHES += \
patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
patches/hotspot/$(HSBUILD)/too-many-args.patch \
patches/openjdk/6997495-test_correction_6857159.patch
-else
-ICEDTEA_PATCHES += \
- patches/pr639-broken_shark_build.patch \
- patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
endif
if WITH_RHINO
@@ -1317,7 +1322,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
$(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
stamps/jamvm.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk \
$(ICEDTEA_BUILD_TARGET)
@@ -1348,7 +1353,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
$(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
stamps/jamvm.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk \
$(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -1544,7 +1549,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
$(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \
stamps/rewrite-rhino.stamp
- $(ARCH_PREFIX) $(MAKE) \
+ $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
$(ICEDTEA_BUILD_TARGET)
diff -r a652f386460b -r 6e809b822ad1 patches/security/20110215/6878713.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20110215/6878713.patch Wed Mar 02 20:43:02 2011 +0000
@@ -0,0 +1,143 @@
+# HG changeset patch
+# User kamg
+# Date 1296505046 18000
+# Node ID a6f5011d46a97d3e710aaed5c8ea85af04236c28
+# Parent 2c8e1acf0433db897eb3bc8f6e1276b2c84769b7
+6878713: Verifier heap corruption, relating to backward jsrs
+Summary: Added overflow detection in arena Amalloc methods
+Reviewed-by: coleenp, phh
+
+diff --git a/src/share/vm/memory/allocation.cpp b/src/share/vm/memory/allocation.cpp
+--- openjdk/hotspot/src/share/vm/memory/allocation.cpp
++++ openjdk/hotspot/src/share/vm/memory/allocation.cpp
+@@ -377,6 +377,9 @@ size_t Arena::used() const {
+ return sum; // Return total consumed space.
+ }
+
++void Arena::signal_out_of_memory(size_t sz, const char* whence) const {
++ vm_exit_out_of_memory(sz, whence);
++}
+
+ // Grow a new Chunk
+ void* Arena::grow( size_t x ) {
+@@ -386,8 +389,9 @@ void* Arena::grow( size_t x ) {
+ Chunk *k = _chunk; // Get filled-up chunk address
+ _chunk = new (len) Chunk(len);
+
+- if (_chunk == NULL)
+- vm_exit_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow");
++ if (_chunk == NULL) {
++ signal_out_of_memory(len * Chunk::aligned_overhead_size(), "Arena::grow");
++ }
+
+ if (k) k->set_next(_chunk); // Append new chunk to end of linked list
+ else _first = _chunk;
+@@ -484,6 +488,7 @@ void* Arena::malloc(size_t size) {
+ // for debugging with UseMallocOnly
+ void* Arena::internal_malloc_4(size_t x) {
+ assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" );
++ check_for_overflow(x, "Arena::internal_malloc_4");
+ if (_hwm + x > _max) {
+ return grow(x);
+ } else {
+diff --git a/src/share/vm/memory/allocation.hpp b/src/share/vm/memory/allocation.hpp
+--- openjdk/hotspot/src/share/vm/memory/allocation.hpp
++++ openjdk/hotspot/src/share/vm/memory/allocation.hpp
+@@ -194,6 +194,15 @@ protected:
+ friend class AllocStats;
+ debug_only(void* malloc(size_t size);)
+ debug_only(void* internal_malloc_4(size_t x);)
++
++ void signal_out_of_memory(size_t request, const char* whence) const;
++
++ void check_for_overflow(size_t request, const char* whence) const {
++ if (UINTPTR_MAX - request < (uintptr_t)_hwm) {
++ signal_out_of_memory(request, whence);
++ }
++ }
++
+ public:
+ Arena();
+ Arena(size_t init_size);
+@@ -207,6 +216,7 @@ protected:
+ assert(is_power_of_2(ARENA_AMALLOC_ALIGNMENT) , "should be a power of 2");
+ x = ARENA_ALIGN(x);
+ debug_only(if (UseMallocOnly) return malloc(x);)
++ check_for_overflow(x, "Arena::Amalloc");
+ NOT_PRODUCT(_bytes_allocated += x);
+ if (_hwm + x > _max) {
+ return grow(x);
+@@ -220,6 +230,7 @@ protected:
+ void *Amalloc_4(size_t x) {
+ assert( (x&(sizeof(char*)-1)) == 0, "misaligned size" );
+ debug_only(if (UseMallocOnly) return malloc(x);)
++ check_for_overflow(x, "Arena::Amalloc_4");
+ NOT_PRODUCT(_bytes_allocated += x);
+ if (_hwm + x > _max) {
+ return grow(x);
+@@ -240,6 +251,7 @@ protected:
+ size_t delta = (((size_t)_hwm + DALIGN_M1) & ~DALIGN_M1) - (size_t)_hwm;
+ x += delta;
+ #endif
++ check_for_overflow(x, "Arena::Amalloc_D");
+ NOT_PRODUCT(_bytes_allocated += x);
+ if (_hwm + x > _max) {
+ return grow(x); // grow() returns a result aligned >= 8 bytes.
+diff --git a/src/share/vm/utilities/globalDefinitions_gcc.hpp b/src/share/vm/utilities/globalDefinitions_gcc.hpp
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -72,6 +72,7 @@
+ # endif
+
+ #ifdef LINUX
++#define __STDC_LIMIT_MACROS
+ #include <inttypes.h>
+ #include <signal.h>
+ #include <ucontext.h>
+diff --git a/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp b/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+@@ -141,6 +141,17 @@ typedef unsigned int uintptr_
+ // If this gets an error, figure out a symbol XXX that implies the
+ // prior definition of intptr_t, and add "&& !defined(XXX)" above.
+ #endif
++#endif
++
++// On solaris 8, UINTPTR_MAX is defined as empty.
++// Everywhere else it's an actual value.
++#if UINTPTR_MAX - 1 == -1
++#undef UINTPTR_MAX
++#ifdef _LP64
++#define UINTPTR_MAX UINT64_MAX
++#else
++#define UINTPTR_MAX UINT32_MAX
++#endif /* ifdef _LP64 */
+ #endif
+
+ // Additional Java basic types
+diff --git a/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/src/share/vm/utilities/globalDefinitions_visCPP.hpp
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
+@@ -36,6 +36,7 @@
+ # include <stdio.h> // for va_list
+ # include <time.h>
+ # include <fcntl.h>
++# include <limits.h>
+ // Need this on windows to get the math constants (e.g., M_PI).
+ #define _USE_MATH_DEFINES
+ # include <math.h>
+@@ -92,6 +93,14 @@ typedef signed __int64 ssize_t;
+ #else
+ typedef signed int intptr_t;
+ typedef signed int ssize_t;
++#endif
++
++#ifndef UINTPTR_MAX
++#ifdef _WIN64
++#define UINTPTR_MAX _UI64_MAX
++#else
++#define UINTPTR_MAX _UI32_MAX
++#endif
+ #endif
+
+ //----------------------------------------------------------------------------------------------------
More information about the distro-pkg-dev
mailing list