Commit 6c3176a2 authored Jan 10, 2015 by Denys Vlasenko Committed by Andy Lutomirski Jan 13, 2015

x86: ia32entry.S: fix wrong symbolic constant usage: R11->ARGOFFSET



The values of these two constants are the same, the meaning is different.

Acked-by: Borislav Petkov <bp@suse.de>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Oleg Nesterov <oleg@redhat.com>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Borislav Petkov <bp@alien8.de>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: X86 ML <x86@kernel.org>
CC: Alexei Starovoitov <ast@plumgrid.com>
CC: Will Drewry <wad@chromium.org>
CC: Kees Cook <keescook@chromium.org>
CC: linux-kernel@vger.kernel.org
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>

parent af9cfe27

arch/x86/ia32/ia32entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -179,8 +179,8 @@ sysenter_dispatch:
		sysexit_from_sys_call:
		andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
		/* clear IF, that popfq doesn't enable interrupts early */
		andl $~0x200,EFLAGS-R11(%rsp)
		movl RIP-R11(%rsp),%edx /* User %eip */
		andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
		movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
		CFI_REGISTER rip,rdx
		RESTORE_ARGS 0,24,0,0,0,0
		xorq %r8,%r8