Skip to contentSkip to conversation

x86/kaslr: Remove two redundant if checks

PATCH In review Thorsten Blum 2 participants 3 messages Aug 2 x86

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 x86/kaslr: Remove two redundant if checks

The loop in slots_fetch_random() either returns the slot address or exits with i == slot_area_index, making the if check redundant. Drop it.

Commit 8391c73c96f2 ("x86/KASLR: Randomize virtual address separately") added the *output != random_addr check because add_identity_map() was only needed when the physical address changed. Commit 8570978ea030 ("x86/boot/compressed/64: Don't pre-map memory in KASLR code") removed that call. Unconditionally assign random_addr and remove the if check.

No functional change.

---
Changes in v3:
- Name commit 8391c73c96f2 that added the check (Boris)
- Keep the comment (Boris)
- v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
- Explain why the check in choose_random_location() is redundant (Boris)
- Reword subject
- v1: https://lore.kernel.org/r/[email protected]/

---
 arch/x86/boot/compressed/kaslr.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/kaslr.c +2 -4
index 8e4bf5365ac6..bb35f76cd3cf 100644
@@ -544,8 +544,7 @@ static u64 slots_fetch_random(void)
 		return slot_areas[i].addr + ((u64)slot * CONFIG_PHYSICAL_ALIGN);
 	}
 
-	if (i == slot_area_index)
-		debug_putstr("slots_fetch_random() failed!?\n");
+	debug_putstr("slots_fetch_random() failed!?\n");
 	return 0;
 }
 
@@ -897,8 +896,7 @@ void choose_random_location(unsigned long input,
 		warn("Physical KASLR disabled: no suitable memory region!");
 	} else {
 		/* Update the new physical address location. */
-		if (*output != random_addr)
-			*output = random_addr;
+		*output = random_addr;
 	}
 
 
maintainer
#1 lore raw
Quoted 2 lines · Thorsten Blum

added the *output != random_addr check because add_identity_map() was only needed when the physical address changed.

The check is there to update *output in case a new random address has been generated.

add_identity_map() was simply called to make sure that the new address is mapped in the page table.

Are you sure you understand the code you're touching?

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#2 lore raw
Quoted 11 lines · Borislav Petkov
Quoted 2 lines · Thorsten Blum

added the *output != random_addr check because add_identity_map() was only needed when the physical address changed.

The check is there to update *output in case a new random address has been generated.

add_identity_map() was simply called to make sure that the new address is mapped in the page table.

Are you sure you understand the code you're touching?

Are you objecting to the reasoning in the commit message, or to removing the if check itself?