[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1@git.kernel.org>
Date: Wed, 12 Jun 2013 15:21:39 -0700
From: tip-bot for Kees Cook <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
keescook@...omium.org, pageexec@...email.hu, tglx@...utronix.de,
hpa@...ux.intel.com
Subject: [tip:x86/urgent] x86: Fix typo in kexec register clearing
Commit-ID: c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1
Gitweb: http://git.kernel.org/tip/c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1
Author: Kees Cook <keescook@...omium.org>
AuthorDate: Wed, 5 Jun 2013 11:47:18 -0700
Committer: H. Peter Anvin <hpa@...ux.intel.com>
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@...omium.org>
Link: http://lkml.kernel.org/r/20130605184718.GA8396@www.outflux.net
Cc: <stable@...r.kernel.org> v2.6.30+
Cc: PaX Team <pageexec@...email.hu>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists