This is a note to let you know that I've just added the patch titled
x86-64: Replace left over sti/cli in ia32 audit exit code
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-64-replace-left-over-sti-cli-in-ia32-audit-exit-code.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 40a1ef95da85843696fc3ebe5fce39b0db32669f Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeul...@suse.com>
Date: Wed, 30 Jan 2013 07:55:53 +0000
Subject: x86-64: Replace left over sti/cli in ia32 audit exit code
From: Jan Beulich <jbeul...@suse.com>
commit 40a1ef95da85843696fc3ebe5fce39b0db32669f upstream.
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 <pmo...@google.com>
Signed-off-by: Jan Beulich <jbeul...@suse.com>
Cc: David Vrabel <david.vra...@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Link: http://lkml.kernel.org/r/5108e01902000078000ba...@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Cc: David Vrabel <david.vra...@citrix.com>
Tested-by: Peter Moody <pmo...@google.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
arch/x86/ia32/ia32entry.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -205,7 +205,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
@@ -215,7 +215,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
Patches currently in stable-queue which might be from jbeul...@suse.com are
queue-3.4/x86-64-replace-left-over-sti-cli-in-ia32-audit-exit-code.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
