Skip to contentSkip to conversation

sh: disallow kexec virtual entry

PATCH Applied Magnus Damm 2 participants 2 messages Mar 19, 2009 – Mar 20, 2009 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: disallow kexec virtual entry

From: Magnus Damm <[email protected]>

Older versions of kexec-tools has a zImage loader that passes a virtual address as entry point. The elf loader otoh it passes a physical address as entry point, and pages are always passed as physical addresses as well.

Only allow physical addresses from now on.

---

 arch/sh/kernel/machine_kexec.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/sh/kernel/machine_kexec.c +8 -1
@@ -46,6 +46,12 @@ void machine_crash_shutdown(struct pt_re
  */
 int machine_kexec_prepare(struct kimage *image)
 {
+	/* older versions of kexec-tools are passing
+	 * the zImage entry point as a virtual address.
+	 */
+	if (image->start != PHYSADDR(image->start))
+		return -EINVAL; /* upgrade your kexec-tools */
+
 	return 0;
 }
 
@@ -125,7 +131,8 @@ void machine_kexec(struct kimage *image)
 
 	/* now call it */
 	rnk = (relocate_new_kernel_t) reboot_code_buffer;
-	(*rnk)(page_list, reboot_code_buffer, image->start);
+	(*rnk)(page_list, reboot_code_buffer,
+	       (unsigned long)phys_to_virt(image->start));
 
 #ifdef CONFIG_KEXEC_JUMP
 	asm volatile("ldc %0, vbr" : : "r" (&vbr_base) : "memory");
Applied
#1 lore raw
Quoted 6 lines · Magnus Damm

Older versions of kexec-tools has a zImage loader that passes a virtual address as entry point. The elf loader otoh it passes a physical address as entry point, and pages are always passed as physical addresses as well.

Only allow physical addresses from now on.

Quoted 6 lines · Magnus Damm

This patch modifies the SuperH RTC driver to only enable carry interrupts when needed. So by default no interrupts are enabled with this patch. Without this patch a suspending system will most likely wake up by the carry interrupt regardless if the alarm interrupt has been enabled or not.

Quoted 4 lines · Magnus Damm

This patch modifies invalid time handling in the SuperH RTC driver. Instead of zeroing the returned value at read-out time we just return an error code and reset invalid values during probe.

Quoted 1 line · Magnus Damm

Flag that the SuperH RTC supports wakeup.

Applied, thanks.