The patch titled
Subject: arm64: setup: introduce kaslr_offset()
has been added to the -mm tree. Its filename is
arm64-setup-introduce-kaslr_offset.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/arm64-setup-introduce-kaslr_offset.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/arm64-setup-introduce-kaslr_offset.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Alexander Popov <alex.popov@xxxxxxxxx>
Subject: arm64: setup: introduce kaslr_offset()
Introduce kaslr_offset() similar to x86_64 to fix kcov.
Link: http://lkml.kernel.org/r/1481417456-28826-2-git-send-email-alex.popov@xxxxxxxxx
Signed-off-by: Alexander Popov <alex.popov@xxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Rob Herring <robh@xxxxxxxxxx>
Cc: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Cc: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
Cc: Jon Masters <jcm@xxxxxxxxxx>
Cc: David Daney <david.daney@xxxxxxxxxx>
Cc: Ganapatrao Kulkarni <gkulkarni@xxxxxxxxxxxxxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Nicolai Stange <nicstange@xxxxxxxxx>
Cc: James Morse <james.morse@xxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Cc: Alexander Popov <alex.popov@xxxxxxxxx>
Cc: syzkaller <syzkaller@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm64/include/asm/setup.h | 19 +++++++++++++++++++
arch/arm64/include/uapi/asm/setup.h | 4 ++--
arch/arm64/kernel/setup.c | 8 ++++----
3 files changed, 25 insertions(+), 6 deletions(-)
diff -puN /dev/null arch/arm64/include/asm/setup.h
--- /dev/null
+++ a/arch/arm64/include/asm/setup.h
@@ -0,0 +1,19 @@
+/*
+ * arch/arm64/include/asm/setup.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_SETUP_H
+#define __ASM_SETUP_H
+
+#include <uapi/asm/setup.h>
+
+static inline unsigned long kaslr_offset(void)
+{
+ return kimage_vaddr - KIMAGE_VADDR;
+}
+
+#endif
diff -puN arch/arm64/include/uapi/asm/setup.h~arm64-setup-introduce-kaslr_offset arch/arm64/include/uapi/asm/setup.h
--- a/arch/arm64/include/uapi/asm/setup.h~arm64-setup-introduce-kaslr_offset
+++ a/arch/arm64/include/uapi/asm/setup.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __ASM_SETUP_H
-#define __ASM_SETUP_H
+#ifndef _UAPI__ASM_SETUP_H
+#define _UAPI__ASM_SETUP_H
#include <linux/types.h>
diff -puN arch/arm64/kernel/setup.c~arm64-setup-introduce-kaslr_offset arch/arm64/kernel/setup.c
--- a/arch/arm64/kernel/setup.c~arm64-setup-introduce-kaslr_offset
+++ a/arch/arm64/kernel/setup.c
@@ -338,11 +338,11 @@ subsys_initcall(topology_init);
static int dump_kernel_offset(struct notifier_block *self, unsigned long v,
void *p)
{
- u64 const kaslr_offset = kimage_vaddr - KIMAGE_VADDR;
+ const unsigned long offset = kaslr_offset();
- if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_offset > 0) {
- pr_emerg("Kernel Offset: 0x%llx from 0x%lx\n",
- kaslr_offset, KIMAGE_VADDR);
+ if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && offset > 0) {
+ pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n",
+ offset, KIMAGE_VADDR);
} else {
pr_emerg("Kernel Offset: disabled\n");
}
_
Patches currently in -mm which might be from alex.popov@xxxxxxxxx are
arm64-setup-introduce-kaslr_offset.patch
kcov-make-kcov-work-properly-with-kaslr-enabled.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
