aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bird <tim.bird@am.sony.com>2012-05-02 22:55:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-21 09:39:58 -0700
commit6007ca9964e4607fd5835be19391b1d85ebc07a4 (patch)
tree3464212252258a74177798ad0a474d6872c439d2
parent2cec670116b95c7c7aa67476170441cd73df9678 (diff)
downloadkernel_samsung_crespo-6007ca9964e4607fd5835be19391b1d85ebc07a4.zip
kernel_samsung_crespo-6007ca9964e4607fd5835be19391b1d85ebc07a4.tar.gz
kernel_samsung_crespo-6007ca9964e4607fd5835be19391b1d85ebc07a4.tar.bz2
ARM: 7410/1: Add extra clobber registers for assembly in kernel_execve
commit e787ec1376e862fcea1bfd523feb7c5fb43ecdb9 upstream. The inline assembly in kernel_execve() uses r8 and r9. Since this code sequence does not return, it usually doesn't matter if the register clobber list is accurate. However, I saw a case where a particular version of gcc used r8 as an intermediate for the value eventually passed to r9. Because r8 is used in the inline assembly, and not mentioned in the clobber list, r9 was set to an incorrect value. This resulted in a kernel panic on execution of the first user-space program in the system. r9 is used in ret_to_user as the thread_info pointer, and if it's wrong, bad things happen. Signed-off-by: Tim Bird <tim.bird@am.sony.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/kernel/sys_arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 62e7c61..0264ab4 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -115,7 +115,7 @@ int kernel_execve(const char *filename,
"Ir" (THREAD_START_SP - sizeof(regs)),
"r" (&regs),
"Ir" (sizeof(regs))
- : "r0", "r1", "r2", "r3", "ip", "lr", "memory");
+ : "r0", "r1", "r2", "r3", "r8", "r9", "ip", "lr", "memory");
out:
return ret;