Mercurial > hg > release > icedtea6-1.10
view patches/openjdk/original/7103224-glibc_name_collision.patch @ 2578:96394d394527
Add security patches for 2012/06/12.
2012-06-07 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add security patches. Make more
patches HotSpot-build specific.
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/arm.patch: Moved to HotSpot-specific versions.
* patches/arch.patch,
* patches/freetypeversion.patch,
* patches/gcc-suffix.patch:
Fix to work with no fuzz.
* patches/hotspot/hs20/arm.patch,
* patches/hotspot/hs20/gcc-stack-markings.patch,
* patches/hotspot/hs20/numa_on_early_glibc.patch,
* patches/hotspot/hs20/sparc-trapsfix.patch,
* patches/hotspot/hs20/version-hotspot.patch:
Split to work with hs20 with no fuzz.
* patches/hotspot/original/arm.patch,
* patches/hotspot/original/gcc-stack-markings.patch,
* patches/hotspot/original/numa_on_early_glibc.patch,
* patches/hotspot/original/sparc-trapsfix.patch,
* patches/hotspot/original/version-hotspot.patch:
Likewise for hs19 (original).
* patches/jaxp-serial-version-uid.patch,
* patches/libraries.patch,
* patches/nio2.patch,
* patches/no-static-linking.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6766342-AA-simple-shape-performance.patch,
* patches/openjdk/6797139-jbutton_truncation.patch,
* patches/openjdk/6851973-kerberos.patch,
* patches/openjdk/7102369-7094468-rmiregistry.patch:
Fixed to work with no fuzz.
* patches/openjdk/hs20/7034464-hugepage.patch,
* patches/openjdk/hs20/7103224-glibc_name_collision.patch,
Fixed to work with hs20 and no fuzz.
* patches/openjdk/mutter.patch:
Fixed to work with no fuzz.
* patches/openjdk/original/7034464-hugepage.patch,
* patches/openjdk/original/7103224-glibc_name_collision.patch,
Fixed to work with hs19 (original) and no fuzz.
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Fixed to work with no fuzz.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch,
* patches/security/20120612/hs20/7110720.patch,
* patches/security/20120612/hs20/7152811.patch,
* patches/security/20120612/original/7110720.patch,
* patches/security/20120612/original/7152811.patch,
Security patches for 2012/06/12.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 08 Jun 2012 14:23:28 +0100 |
| parents | |
| children |
line wrap: on
line source
diff -Nru openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp --- openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp 2011-02-28 16:03:20.000000000 +0000 +++ openjdk/hotspot/src/share/vm/opto/addnode.cpp 2012-06-08 12:50:53.702845760 +0100 @@ -27,8 +27,6 @@ #include "incls/_precompiled.incl" #include "incls/_addnode.cpp.incl" -#define MAXFLOAT ((float)3.40282346638528860e+38) - // Classic Add functionality. This covers all the usual 'add' behaviors for // an algebraic ring. Add-integer, add-float, add-double, and binary-or are // all inherited from this class. The various identity values are supplied diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jniCheck.cpp openjdk/hotspot/src/share/vm/prims/jniCheck.cpp --- openjdk.orig/hotspot/src/share/vm/prims/jniCheck.cpp 2011-02-28 16:03:20.000000000 +0000 +++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2012-06-08 12:50:53.706845826 +0100 @@ -80,7 +80,7 @@ if (env != xenv) { \ NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ } \ - __ENTRY(result_type, header, thr) + VM_ENTRY_BASE(result_type, header, thr) #define UNCHECKED() (unchecked_jni_NativeInterface) diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnter.xsl openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl --- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2011-02-28 16:03:20.000000000 +0000 +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2012-06-08 12:50:53.706845826 +0100 @@ -424,7 +424,7 @@ <xsl:value-of select="$space"/> <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> <xsl:value-of select="$space"/> - <xsl:text>__ENTRY(jvmtiError, </xsl:text> + <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> <xsl:apply-templates select="." mode="functionid"/> <xsl:text> , current_thread)</xsl:text> <xsl:value-of select="$space"/> diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp --- openjdk.orig/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-06-08 12:49:49.969789411 +0100 +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-06-08 12:50:53.706845826 +0100 @@ -126,7 +126,7 @@ // from native so as to resolve the jthread. ThreadInVMfromNative __tiv(current_thread); - __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) + VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) debug_only(VMNativeEntryWrapper __vew;) oop thread_oop = JNIHandles::resolve_external_guard(thread); diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jvmtiExport.cpp openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp --- openjdk.orig/hotspot/src/share/vm/prims/jvmtiExport.cpp 2011-02-28 16:03:21.000000000 +0000 +++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2012-06-08 12:50:53.706845826 +0100 @@ -344,7 +344,7 @@ JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); // transition code: native to VM ThreadInVMfromNative __tiv(current_thread); - __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) + VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) debug_only(VMNativeEntryWrapper __vew;) JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp --- openjdk.orig/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-02-28 16:03:21.000000000 +0000 +++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-06-08 12:50:53.706845826 +0100 @@ -46,9 +46,9 @@ } }; -// InterfaceSupport provides functionality used by the __LEAF and __ENTRY -// macros. These macros are used to guard entry points into the VM and -// perform checks upon leave of the VM. +// InterfaceSupport provides functionality used by the VM_LEAF_BASE and +// VM_ENTRY_BASE macros. These macros are used to guard entry points into +// the VM and perform checks upon leave of the VM. class InterfaceSupport: AllStatic { @@ -391,7 +391,7 @@ // LEAF routines do not lock, GC or throw exceptions -#define __LEAF(result_type, header) \ +#define VM_LEAF_BASE(result_type, header) \ TRACE_CALL(result_type, header) \ debug_only(NoHandleMark __hm;) \ /* begin of body */ @@ -399,7 +399,7 @@ // ENTRY routines may lock, GC and throw exceptions -#define __ENTRY(result_type, header, thread) \ +#define VM_ENTRY_BASE(result_type, header, thread) \ TRACE_CALL(result_type, header) \ HandleMarkCleaner __hm(thread); \ Thread* THREAD = thread; \ @@ -408,7 +408,7 @@ // QUICK_ENTRY routines behave like ENTRY but without a handle mark -#define __QUICK_ENTRY(result_type, header, thread) \ +#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \ TRACE_CALL(result_type, header) \ debug_only(NoHandleMark __hm;) \ Thread* THREAD = thread; \ @@ -421,20 +421,20 @@ #define IRT_ENTRY(result_type, header) \ result_type header { \ ThreadInVMfromJava __tiv(thread); \ - __ENTRY(result_type, header, thread) \ + VM_ENTRY_BASE(result_type, header, thread) \ debug_only(VMEntryWrapper __vew;) #define IRT_LEAF(result_type, header) \ result_type header { \ - __LEAF(result_type, header) \ + VM_LEAF_BASE(result_type, header) \ debug_only(No_Safepoint_Verifier __nspv(true);) #define IRT_ENTRY_NO_ASYNC(result_type, header) \ result_type header { \ ThreadInVMfromJavaNoAsyncException __tiv(thread); \ - __ENTRY(result_type, header, thread) \ + VM_ENTRY_BASE(result_type, header, thread) \ debug_only(VMEntryWrapper __vew;) // Another special case for nmethod_entry_point so the nmethod that the @@ -445,7 +445,7 @@ result_type header { \ nmethodLocker _nmlock(nm); \ ThreadInVMfromJavaNoAsyncException __tiv(thread); \ - __ENTRY(result_type, header, thread) + VM_ENTRY_BASE(result_type, header, thread) #define IRT_END } @@ -455,20 +455,20 @@ #define JRT_ENTRY(result_type, header) \ result_type header { \ ThreadInVMfromJava __tiv(thread); \ - __ENTRY(result_type, header, thread) \ + VM_ENTRY_BASE(result_type, header, thread) \ debug_only(VMEntryWrapper __vew;) #define JRT_LEAF(result_type, header) \ result_type header { \ - __LEAF(result_type, header) \ + VM_LEAF_BASE(result_type, header) \ debug_only(JRT_Leaf_Verifier __jlv;) #define JRT_ENTRY_NO_ASYNC(result_type, header) \ result_type header { \ ThreadInVMfromJavaNoAsyncException __tiv(thread); \ - __ENTRY(result_type, header, thread) \ + VM_ENTRY_BASE(result_type, header, thread) \ debug_only(VMEntryWrapper __vew;) // Same as JRT Entry but allows for return value after the safepoint @@ -501,11 +501,11 @@ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ - __ENTRY(result_type, header, thread) + VM_ENTRY_BASE(result_type, header, thread) // Ensure that the VMNativeEntryWrapper constructor, which can cause -// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY). +// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE). #define JNI_QUICK_ENTRY(result_type, header) \ extern "C" { \ result_type JNICALL header { \ @@ -513,7 +513,7 @@ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ - __QUICK_ENTRY(result_type, header, thread) + VM_QUICK_ENTRY_BASE(result_type, header, thread) #define JNI_LEAF(result_type, header) \ @@ -521,7 +521,7 @@ result_type JNICALL header { \ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - __LEAF(result_type, header) + VM_LEAF_BASE(result_type, header) // Close the routine and the extern "C" @@ -537,7 +537,7 @@ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ - __ENTRY(result_type, header, thread) + VM_ENTRY_BASE(result_type, header, thread) #define JVM_ENTRY_NO_ENV(result_type, header) \ @@ -546,7 +546,7 @@ JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ - __ENTRY(result_type, header, thread) + VM_ENTRY_BASE(result_type, header, thread) #define JVM_QUICK_ENTRY(result_type, header) \ @@ -555,14 +555,14 @@ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ - __QUICK_ENTRY(result_type, header, thread) + VM_QUICK_ENTRY_BASE(result_type, header, thread) #define JVM_LEAF(result_type, header) \ extern "C" { \ result_type JNICALL header { \ VM_Exit::block_if_vm_exited(); \ - __LEAF(result_type, header) + VM_LEAF_BASE(result_type, header) #define JVM_END } }