aboutsummaryrefslogtreecommitdiffstats
path: root/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2019-01-05 20:51:00 +0100
committerMathias Kresin <dev@kresin.me>2019-01-15 19:11:53 +0100
commitad8c2d6099a7da5192ee6e2c52a8303642271877 (patch)
tree29b3bc72d1e7448bc41636af088419eda1055339 /tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
parent4029788ff36a05a8731183269b675624269da84e (diff)
downloadupstream-ad8c2d6099a7da5192ee6e2c52a8303642271877.tar.gz
upstream-ad8c2d6099a7da5192ee6e2c52a8303642271877.tar.bz2
upstream-ad8c2d6099a7da5192ee6e2c52a8303642271877.zip
tools: add zip utility
One image requires a zip compressed image, so add the zip util found in the packages feed, and extend it with some useful debian patches. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch')
-rw-r--r--tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch b/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
new file mode 100644
index 0000000000..8b479faeda
--- /dev/null
+++ b/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
@@ -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 @@ _crc32: /* ulg c
+ #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 @@ L__return:
+ #endif /* i386 || _I386 || _i386 || __i386 */
+
+ #endif /* !USE_ZLIB */
++.section .note.GNU-stack, "", @progbits
++.previous