/hg/icedtea6: 2009-08-27 Kees Cook <kees at canonical.com>

[doko at icedtea.classpath.org]

changeset be41014d9d9b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be41014d9d9b
author: doko at ubuntu.com
date: Thu Aug 27 17:48:27 2009 +0200

	2009-08-27 Kees Cook <kees at canonical.com>

	 * patches/hotspot/default/icedtea-gcc-stack-markings.patch:
	New. Adding stack markings to the x86 assembly for not using
	executable stack.


diffstat:

3 files changed, 21 insertions(+)
ChangeLog                                                |    6 ++++++
Makefile.am                                              |    1 +
patches/hotspot/default/icedtea-gcc-stack-markings.patch |   14 ++++++++++++++

diffs (42 lines):

diff -r 24f3605b8aa8 -r be41014d9d9b ChangeLog
--- a/ChangeLog	Thu Aug 27 17:43:31 2009 +0200
+++ b/ChangeLog	Thu Aug 27 17:48:27 2009 +0200
@@ -1,3 +1,9 @@ 2009-08-27  Kees Cook <kees at canonical.co
+2009-08-27  Kees Cook <kees at canonical.com>
+
+	* patches/hotspot/default/icedtea-gcc-stack-markings.patch: New.
+	Adding stack markings to the x86 assembly for not using executable
+        stack.
+
 2009-08-27  Kees Cook <kees at canonical.com>
 
 	* patches/openjdk/oj100103-debugger-socket-overflow.patch: New.
diff -r 24f3605b8aa8 -r be41014d9d9b Makefile.am
--- a/Makefile.am	Thu Aug 27 17:43:31 2009 +0200
+++ b/Makefile.am	Thu Aug 27 17:48:27 2009 +0200
@@ -707,6 +707,7 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-explicit-target-arch.patch \
 	patches/openjdk/6648816.patch \
 	patches/openjdk/oj100103-debugger-socket-overflow.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 24f3605b8aa8 -r be41014d9d9b patches/hotspot/default/icedtea-gcc-stack-markings.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/default/icedtea-gcc-stack-markings.patch	Thu Aug 27 17:48:27 2009 +0200
@@ -0,0 +1,14 @@
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s~	2009-08-06 01:08:57.000000000 -0700
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s	2009-08-06 01:09:27.000000000 -0700
+@@ -650,3 +650,4 @@ _Atomic_cmpxchg_long:
+         popl     %ebx
+         ret
+ 
++.section        .note.GNU-stack, "", @progbits
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s~	2009-08-06 01:08:57.000000000 -0700
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s	2009-08-06 01:09:27.000000000 -0700
+@@ -400,3 +400,4 @@ _Atomic_cmpxchg_long:
+         addq     $4,%rdx
+         jg       4b
+         ret
++.section        .note.GNU-stack, "", @progbits