Commit 313751fa authored Jan 30, 2013 by Jan Beulich Committed by Dave Airlie Feb 08, 2013

x86-64: Replace left over sti/cli in ia32 audit exit code



For some reason they didn't get replaced so far by their
paravirt equivalents, resulting in code to be run with
interrupts disabled that doesn't expect so (causing, in the
observed case, a BUG_ON() to trigger) when syscall auditing is
enabled.

David (Cc-ed) came up with an identical fix, so likely this can
be taken to count as an ack from him.

Reported-by: Peter Moody <pmoody@google.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Link: http://lkml.kernel.org/r/5108E01902000078000BA9C5@nat28.tlf.novell.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Tested-by: Peter Moody <pmoody@google.com>

parent 2a6f79e8

arch/x86/ia32/ia32entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ sysexit_from_sys_call:
		testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
		jnz ia32_ret_from_sys_call
		TRACE_IRQS_ON
		sti
		ENABLE_INTERRUPTS(CLBR_NONE)
		movl %eax,%esi /* second arg, syscall return value */
		cmpl $-MAX_ERRNO,%eax /* is it an error ? */
		jbe 1f
		@@ -217,7 +217,7 @@ sysexit_from_sys_call:
		call __audit_syscall_exit
		movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
		movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
		cli
		DISABLE_INTERRUPTS(CLBR_NONE)
		TRACE_IRQS_OFF
		testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
		jz \exit