Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933943AbbDIJC5 (ORCPT ); Thu, 9 Apr 2015 05:02:57 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51803 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932814AbbDIJCx (ORCPT ); Thu, 9 Apr 2015 05:02:53 -0400 Date: Thu, 9 Apr 2015 02:02:13 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: brgerst@gmail.com, bp@alien8.de, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, fweisbec@gmail.com, rostedt@goodmis.org, dvlasenk@redhat.com, oleg@redhat.com, wad@chromium.org, keescook@chromium.org, luto@amacapital.net, linux-kernel@vger.kernel.org, mingo@kernel.org, ast@plumgrid.com Reply-To: mingo@kernel.org, ast@plumgrid.com, luto@amacapital.net, linux-kernel@vger.kernel.org, keescook@chromium.org, wad@chromium.org, fweisbec@gmail.com, rostedt@goodmis.org, dvlasenk@redhat.com, oleg@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, bp@alien8.de, brgerst@gmail.com In-Reply-To: <1428439424-7258-2-git-send-email-dvlasenk@redhat.com> References: <1428439424-7258-2-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Move stub_x32_execvecloser() to stub_execveat() Git-Commit-ID: 05f1752d195c145d02ae40881d0985c2cfbee473 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2735 Lines: 89 Commit-ID: 05f1752d195c145d02ae40881d0985c2cfbee473 Gitweb: http://git.kernel.org/tip/05f1752d195c145d02ae40881d0985c2cfbee473 Author: Denys Vlasenko AuthorDate: Tue, 7 Apr 2015 22:43:38 +0200 Committer: Ingo Molnar CommitDate: Thu, 9 Apr 2015 10:31:24 +0200 x86/asm/entry/64: Move stub_x32_execvecloser() to stub_execveat() This is a preparatory patch for moving stub32_execve[at]() to this file. It makes sense to have all execve stubs in one place, so that they can reuse code. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Will Drewry Link: http://lkml.kernel.org/r/1428439424-7258-2-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 5252e60..f7d9ba6 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -521,6 +521,23 @@ ENTRY(stub_execveat) CFI_ENDPROC END(stub_execveat) +#ifdef CONFIG_X86_X32_ABI +ENTRY(stub_x32_execve) + CFI_STARTPROC + DEFAULT_FRAME 0, 8 + call compat_sys_execve + jmp return_from_execve + CFI_ENDPROC +END(stub_x32_execve) +ENTRY(stub_x32_execveat) + CFI_STARTPROC + DEFAULT_FRAME 0, 8 + call compat_sys_execveat + jmp return_from_execve + CFI_ENDPROC +END(stub_x32_execveat) +#endif + /* * sigreturn is special because it needs to restore all registers on return. * This cannot be done with SYSRET, so use the IRET return path instead. @@ -555,23 +572,6 @@ ENTRY(stub_x32_rt_sigreturn) jmp return_from_stub CFI_ENDPROC END(stub_x32_rt_sigreturn) - -ENTRY(stub_x32_execve) - CFI_STARTPROC - DEFAULT_FRAME 0, 8 - call compat_sys_execve - jmp return_from_execve - CFI_ENDPROC -END(stub_x32_execve) - -ENTRY(stub_x32_execveat) - CFI_STARTPROC - DEFAULT_FRAME 0, 8 - call compat_sys_execveat - jmp return_from_execve - CFI_ENDPROC -END(stub_x32_execveat) - #endif /* -- 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/