[PATCH v5 17/21] x86, KASLR: Clarify purpose of each get_random_long

[Kees Cook]

KASLR will be calling get_random_long twice, but the debug output won't
distinguishing between them. This patch adds a report on when it is
fetching the physical vs virtual address offset. With this, once the
virtual offset is separate, the report changes:

Before:
KASLR using RDTSC...
KASLR using RDTSC...

After:
Physical KASLR using RDTSC...
Virtual KASLR using RDTSC...

Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 arch/x86/boot/compressed/aslr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index b527ff10372a..c58215d5a80d 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -60,7 +60,7 @@ static unsigned long get_random_boot(void)
        return hash;
 }
 
-static unsigned long get_random_long(void)
+static unsigned long get_random_long(const char *purpose)
 {
 #ifdef CONFIG_X86_64
        const unsigned long mix_const = 0x5d6008cbf3848dd3UL;
@@ -70,7 +70,8 @@ static unsigned long get_random_long(void)
        unsigned long raw, random = get_random_boot();
        bool use_i8254 = true;
 
-       debug_putstr("KASLR using");
+       debug_putstr(purpose);
+       debug_putstr(" KASLR using");
 
        if (has_cpuflag(X86_FEATURE_RDRAND)) {
                debug_putstr(" RDRAND");
@@ -338,7 +339,7 @@ static unsigned long slots_fetch_random(void)
        if (slot_max == 0)
                return 0;
 
-       return slots[get_random_long() % slot_max];
+       return slots[get_random_long("Physical") % slot_max];
 }
 
 static void process_e820_entry(struct e820entry *entry,
@@ -425,7 +426,7 @@ static unsigned long find_random_virt_offset(unsigned long 
minimum,
        slots = (KERNEL_IMAGE_SIZE - minimum - image_size) /
                 CONFIG_PHYSICAL_ALIGN + 1;
 
-       random = get_random_long() % slots;
+       random = get_random_long("Virtual") % slots;
 
        return random * CONFIG_PHYSICAL_ALIGN + minimum;
 }
-- 
2.6.3