1 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c
index f0e6ab8abe9c..b09b6f75f759 100644
--- a/arch/arm64/kernel/kaslr.c
+++ b/arch/arm64/kernel/kaslr.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
+#include <asm/cacheflush.h>
 #include <asm/fixmap.h>
 #include <asm/kernel-pgtable.h>
 #include <asm/memory.h>
@@ -43,7 +44,7 @@ static __init u64 get_kaslr_seed(void *fdt)
         return ret;
 }
 
-static __init const u8 *get_cmdline(void *fdt)
+static __init const u8 *kaslr_get_cmdline(void *fdt)
 {
         static __initconst const u8 default_cmdline[] = CONFIG_CMDLINE;
 
@@ -87,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
          * we end up running with module randomization disabled.
          */
         module_alloc_base = (u64)_etext - MODULES_VSIZE;
+        __flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));
 
         /*
          * Try to map the FDT early. If this fails, we simply bail,
@@ -109,7 +111,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
          * Check if 'nokaslr' appears on the command line, and
          * return 0 if that is the case.
          */
-        cmdline = get_cmdline(fdt);
+        cmdline = kaslr_get_cmdline(fdt);
         str = strstr(cmdline, "nokaslr");
         if (str == cmdline || (str > cmdline && *(str - 1) == ' '))
                 return 0;
@@ -169,5 +171,8 @@ u64 __init kaslr_early_init(u64 dt_phys)
         module_alloc_base += (module_range * (seed & ((1 << 21) - 1))) >> 21;
         module_alloc_base &= PAGE_MASK;
 
+        __flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));
+        __flush_dcache_area(&memstart_offset_seed, sizeof(memstart_offset_seed));
+
         return offset;
 }