2014-08-30 12:37:34 +00:00
|
|
|
From a2a1e564bbe995f44de2023893f6dea51668b51e Mon Sep 17 00:00:00 2001
|
2014-05-10 08:07:15 +00:00
|
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
|
|
Date: Sat, 10 May 2014 03:20:35 -0400
|
2014-09-11 13:45:22 +00:00
|
|
|
Subject: [PATCH 08/12] arm, arm64: Mark stack as non-executable.
|
2014-05-10 08:07:15 +00:00
|
|
|
|
|
|
|
|
The same fix as this one, which was only fully applied to
|
|
|
|
|
i686 & x86-64:
|
|
|
|
|
|
|
|
|
|
http://caml.inria.fr/mantis/view.php?id=4564
|
|
|
|
|
---
|
|
|
|
|
asmrun/arm.S | 3 +++
|
|
|
|
|
asmrun/arm64.S | 3 +++
|
|
|
|
|
2 files changed, 6 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/asmrun/arm.S b/asmrun/arm.S
|
2014-08-22 19:01:51 +00:00
|
|
|
index 9720665..6a9eef0 100644
|
2014-05-10 08:07:15 +00:00
|
|
|
--- a/asmrun/arm.S
|
|
|
|
|
+++ b/asmrun/arm.S
|
2014-08-22 19:01:51 +00:00
|
|
|
@@ -498,3 +498,6 @@ caml_system__frametable:
|
2014-05-10 08:07:15 +00:00
|
|
|
.align 2
|
|
|
|
|
.type caml_system__frametable, %object
|
|
|
|
|
.size caml_system__frametable, .-caml_system__frametable
|
|
|
|
|
+
|
|
|
|
|
+ /* Mark stack as non-executable, PR#4564 */
|
|
|
|
|
+ .section .note.GNU-stack,"",%progbits
|
|
|
|
|
diff --git a/asmrun/arm64.S b/asmrun/arm64.S
|
2014-08-22 19:01:51 +00:00
|
|
|
index 9b4b9ab..c23168b 100644
|
2014-05-10 08:07:15 +00:00
|
|
|
--- a/asmrun/arm64.S
|
|
|
|
|
+++ b/asmrun/arm64.S
|
2014-08-22 19:01:51 +00:00
|
|
|
@@ -549,3 +549,6 @@ caml_system__frametable:
|
2014-05-10 08:07:15 +00:00
|
|
|
.align 3
|
|
|
|
|
.type caml_system__frametable, %object
|
|
|
|
|
.size caml_system__frametable, .-caml_system__frametable
|
|
|
|
|
+
|
|
|
|
|
+ /* Mark stack as non-executable, PR#4564 */
|
|
|
|
|
+ .section .note.GNU-stack,"",%progbits
|
|
|
|
|
--
|
2014-08-22 19:01:51 +00:00
|
|
|
2.0.4
|
2014-05-10 08:07:15 +00:00
|
|
|
|
