Patch "arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y" has been added to the 4.8-stable tree

This is a note to let you know that I've just added the patch titled

arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm64-kaslr-fix-breakage-with-config_modversions-y.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ard Biesheuvel <[email protected]>
Date: Thu, 13 Oct 2016 17:42:09 +0100
Subject: arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y

From: Ard Biesheuvel <[email protected]>

commit 9c0e83c371cf4696926c95f9c8c77cd6ea803426 upstream.

As it turns out, the KASLR code breaks CONFIG_MODVERSIONS, since the kcrctab has an absolute address field that is relocated at runtime when the kernel offset is randomized.

This has been fixed already for PowerPC in the past, so simply wire up the existing code dealing with this issue.

---
 arch/arm64/include/asm/module.h |    5 +++++
 1 file changed, 5 insertions(+)

@@ -17,6 +17,7 @@
 #define __ASM_MODULE_H
 
 #include <asm-generic/module.h>
+#include <asm/memory.h>
 
 #define MODULE_ARCH_VERMAGIC	"aarch64"
 

@@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module
 			  Elf64_Sym *sym);
 
 #ifdef CONFIG_RANDOMIZE_BASE
+#ifdef CONFIG_MODVERSIONS
+#define ARCH_RELOCATES_KCRCTAB
+#define reloc_start 		(kimage_vaddr - KIMAGE_VADDR)
+#endif
 extern u64 module_alloc_base;
 #else
 #define module_alloc_base	((u64)_etext - MODULES_VSIZE)

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/arm64-kaslr-fix-breakage-with-config_modversions-y.patch queue-4.8/x86-platform-uv-fix-support-for-efi_old_memmap-after-bios-callback-updates.patch