Mercurial > hg > release > icedtea6-1.6
changeset 1706:bd932bfc5a03
2009-08-27 Kees Cook <kees@canonical.com>
* patches/hotspot/default/icedtea-gcc-stack-markings.patch: New.
Adding stack markings to the x86 assembly for not using executable
stack.
| author | doko@ubuntu.com |
|---|---|
| date | Thu, 27 Aug 2009 17:48:27 +0200 |
| parents | d7a1543dcb1e |
| children | f734c3dcd1a0 |
| files | ChangeLog Makefile.am patches/hotspot/default/icedtea-gcc-stack-markings.patch |
| diffstat | 3 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 17 16:48:26 2010 +0000 +++ b/ChangeLog Thu Aug 27 17:48:27 2009 +0200 @@ -1,3 +1,9 @@ +2009-08-27 Kees Cook <kees@canonical.com> + + * patches/hotspot/default/icedtea-gcc-stack-markings.patch: New. + Adding stack markings to the x86 assembly for not using executable + stack. + 2010-03-17 Andrew John Hughes <ahughes@redhat.com> * NEWS: Update for 1.6.3.
--- a/Makefile.am Wed Mar 17 16:48:26 2010 +0000 +++ b/Makefile.am Thu Aug 27 17:48:27 2009 +0200 @@ -729,6 +729,7 @@ patches/hotspot/$(HSBUILD)/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
--- /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