lkml.org 
[lkml]   [2011]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[BUGFIX] kexec, x86, Fix incorrect jump back address if not preserve context
Date
In kexec jump support, jump back address passed to the kexeced kernel
via function calling ABI, that is, the function call return address is
the jump back entry. And jump back entry == 0 should be used to
signal that jump back or preserve context is not enabled in original
kernel. But in original implementation, the stack position used for
function call return address is not cleared if preserve context is
disabled. The patch fixes this issue.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Reported-and-tested-by: Yin Kangkai <kangkai.yin@intel.com>
---
arch/x86/kernel/relocate_kernel_32.S | 2 ++
arch/x86/kernel/relocate_kernel_64.S | 2 ++
2 files changed, 4 insertions(+)

--- a/arch/x86/kernel/relocate_kernel_32.S
+++ b/arch/x86/kernel/relocate_kernel_32.S
@@ -97,6 +97,8 @@ relocate_kernel:
ret

identity_mapped:
+ /* set return address as 0 if not preserve context */
+ pushl $0
/* store the start address on the stack */
pushl %edx

--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -100,6 +100,8 @@ relocate_kernel:
ret

identity_mapped:
+ /* set return address as 0 if not preserve context */
+ pushq $0
/* store the start address on the stack */
pushq %rdx


\
 
 \ /
  Last update: 2011-07-14 03:37    [W:0.027 / U:1.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site