summaryrefslogtreecommitdiff
path: root/zip/patches/06-stack-markings-to-avoid-executable-stack
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2013-03-04 14:23:19 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2013-03-04 14:23:19 +0400
commit59ad6e21eac75fcdd3aeb84b430e32a3366c2fec (patch)
tree4b042e46f76e90fc14ed63b6a2ad82c6804b540a /zip/patches/06-stack-markings-to-avoid-executable-stack
parentceaa1852eeab8151817dc3986136be98d586fa08 (diff)
downloadcibs-pkgs-59ad6e21eac75fcdd3aeb84b430e32a3366c2fec.tar.gz
zip 3.0 with Debian patches
Diffstat (limited to 'zip/patches/06-stack-markings-to-avoid-executable-stack')
-rw-r--r--zip/patches/06-stack-markings-to-avoid-executable-stack21
1 files changed, 21 insertions, 0 deletions
diff --git a/zip/patches/06-stack-markings-to-avoid-executable-stack b/zip/patches/06-stack-markings-to-avoid-executable-stack
new file mode 100644
index 0000000..9d8a8ff
--- /dev/null
+++ b/zip/patches/06-stack-markings-to-avoid-executable-stack
@@ -0,0 +1,21 @@
+From: Kees Cook <kees@debian.org>
+Subject: put stack markings in i386 assembly to avoid executable stack
+Bug-Debian: http://bugs.debian.org/528280
+X-Debian-version: 3.0-2
+
+--- a/crc_i386.S
++++ b/crc_i386.S
+@@ -302,3 +302,5 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++.section .note.GNU-stack, "", @progbits
++.previous
+--- a/match.S
++++ b/match.S
+@@ -405,3 +405,5 @@
+ #endif /* i386 || _I386 || _i386 || __i386 */
+
+ #endif /* !USE_ZLIB */
++.section .note.GNU-stack, "", @progbits
++.previous