Merge patch series "riscv: Introduce KASLR"

[platform/kernel/linux-rpi.git] / arch / riscv / kernel / setup.c

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 32c2e1e..e600aab 100644 (file)
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 #include <linux/efi.h>
 #include <linux/crash_dump.h>
+#include <linux/panic_notifier.h>
 
 #include <asm/acpi.h>
 #include <asm/alternative.h>
@@ -347,3 +348,27 @@ void free_initmem(void)
 
        free_initmem_default(POISON_FREE_INITMEM);
 }
+
+static int dump_kernel_offset(struct notifier_block *self,
+                             unsigned long v, void *p)
+{
+       pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n",
+                kernel_map.virt_offset,
+                KERNEL_LINK_ADDR);
+
+       return 0;
+}
+
+static struct notifier_block kernel_offset_notifier = {
+       .notifier_call = dump_kernel_offset
+};
+
+static int __init register_kernel_offset_dumper(void)
+{
+       if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))
+               atomic_notifier_chain_register(&panic_notifier_list,
+                                              &kernel_offset_notifier);
+
+       return 0;
+}
+device_initcall(register_kernel_offset_dumper);