[tip:x86/urgent] x86: Fix typo in kexec register clearing

From: tip-bot for Kees Cook
Date: Wed Jun 12 2013 - 18:23:08 EST


Commit-ID: c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1
Gitweb: http://git.kernel.org/tip/c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1
Author: Kees Cook <keescook@xxxxxxxxxxxx>
AuthorDate: Wed, 5 Jun 2013 11:47:18 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Wed, 12 Jun 2013 15:16:18 -0700

x86: Fix typo in kexec register clearing

Fixes a typo in register clearing code. Thanks to PaX Team for fixing
this originally, and James Troup for pointing it out.

Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20130605184718.GA8396@xxxxxxxxxxxxxxx
Cc: <stable@xxxxxxxxxxxxxxx> v2.6.30+
Cc: PaX Team <pageexec@xxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
arch/x86/kernel/relocate_kernel_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 7a6f3b3..f2bb9c9 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -160,7 +160,7 @@ identity_mapped:
xorq %rbp, %rbp
xorq %r8, %r8
xorq %r9, %r9
- xorq %r10, %r9
+ xorq %r10, %r10
xorq %r11, %r11
xorq %r12, %r12
xorq %r13, %r13
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/