[PATCH] x86/entry/64: Fix warning on compat syscalls with CONFIG_AUDITSYSCALL=n

From	Andy Lutomirski <luto@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH] x86/entry/64: Fix warning on compat syscalls with CONFIG_AUDITSYSCALL=n
Date	2015-07-07 20:00 +0200
Message-ID	<pJFjX-dE-7@gated-at.bofh.it> (permalink)
References	<pJDBv-7Nx-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

int_ret_from_sys_call now expects IRQs to be enabled.  I got this right
in the real sysexit_audit and sysretl_audit asm paths, but I missed it
in the #defined-away versions when CONFIG_AUDITSYSCALL=n.  This is
a straightforward fix for CONFIG_AUDITSYSCALL=n

Fixes: 29ea1b258b98 ("x86/entry/64: Migrate 64-bit and compat syscalls to the new exit handlers and remove old assembly code")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 arch/x86/entry/entry_64_compat.S | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index 25aca51a6324..d7571532e7ce 100644
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -22,8 +22,8 @@
 #define __AUDIT_ARCH_LE		0x40000000
 
 #ifndef CONFIG_AUDITSYSCALL
-# define sysexit_audit		ia32_ret_from_sys_call
-# define sysretl_audit		ia32_ret_from_sys_call
+# define sysexit_audit		ia32_ret_from_sys_call_irqs_off
+# define sysretl_audit		ia32_ret_from_sys_call_irqs_off
 #endif
 
 	.section .entry.text, "ax"
@@ -466,6 +466,10 @@ ia32_badarg:
 	/* And exit again. */
 	jmp retint_user
 
+ia32_ret_from_sys_call_irqs_off:
+	TRACE_IRQS_ON
+	ENABLE_INTERRUPTS(CLBR_NONE)
+
 ia32_ret_from_sys_call:
 	xorl	%eax, %eax		/* Do not leak kernel information */
 	movq	%rax, R11(%rsp)
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] x86/entry/64: Fix warning on compat syscalls with CONFIG_AUDITSYSCALL=n Andy Lutomirski <luto@kernel.org> - 2015-07-07 20:00 +0200

csiph-web