From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 18 May 2017 09:32:05 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.54~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cbb9e7b52a1a768530eb7b569ea401ce51c8bd2;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	arm64-make-sys_call_table-const.patch
---

diff --git a/queue-3.18/arm64-make-sys_call_table-const.patch b/queue-3.18/arm64-make-sys_call_table-const.patch
new file mode 100644
index 00000000000..040f712b6dd
--- /dev/null
+++ b/queue-3.18/arm64-make-sys_call_table-const.patch
@@ -0,0 +1,36 @@
+From c623b33b4e9599c6ac5076f7db7369eb9869aa04 Mon Sep 17 00:00:00 2001
+From: Mark Rutland <mark.rutland@arm.com>
+Date: Thu, 8 Jan 2015 11:42:59 +0000
+Subject: arm64: make sys_call_table const
+
+From: Mark Rutland <mark.rutland@arm.com>
+
+commit c623b33b4e9599c6ac5076f7db7369eb9869aa04 upstream.
+
+As with x86, mark the sys_call_table const such that it will be placed
+in the .rodata section. This will cause attempts to modify the table
+(accidental or deliberate) to fail when strict page permissions are in
+place. In the absence of strict page permissions, there should be no
+functional change.
+
+Signed-off-by: Mark Rutland <mark.rutland@arm.com>
+Acked-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kernel/sys.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/kernel/sys.c
++++ b/arch/arm64/kernel/sys.c
+@@ -50,7 +50,7 @@ asmlinkage long sys_mmap(unsigned long a
+  * The sys_call_table array must be 4K aligned to be accessible from
+  * kernel/entry.S.
+  */
+-void *sys_call_table[__NR_syscalls] __aligned(4096) = {
++void * const sys_call_table[__NR_syscalls] __aligned(4096) = {
+ 	[0 ... __NR_syscalls - 1] = sys_ni_syscall,
+ #include <asm/unistd.h>
+ };
diff --git a/queue-3.18/series b/queue-3.18/series
index defa135a7ad..866a9ba1a5d 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -27,3 +27,4 @@ md-raid1-avoid-reusing-a-resync-bio-after-error-handling.patch
 serial-omap-fix-runtime-pm-handling-on-unbind.patch
 serial-omap-suspend-device-on-probe-errors.patch
 bluetooth-fix-user-channel-for-32bit-userspace-on-64bit-kernel.patch
+arm64-make-sys_call_table-const.patch