LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Brian Gerst <brgerst@gmail.com>
To: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>,
	Andy Lutomirski <luto@amacapital.net>,
	Oleg Nesterov <oleg@redhat.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Alexei Starovoitov <ast@plumgrid.com>,
	Will Drewry <wad@chromium.org>, Kees Cook <keescook@chromium.org>,
	"the arch/x86 maintainers" <x86@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] x86/asm/entry/64: 32-bit execve stubs are identical to x32 ones, merge them.
Date: Wed, 22 Apr 2015 10:07:55 -0400	[thread overview]
Message-ID: <CAMzpN2iSs2MdKLFw=oFTe0OFBSKUjMvSAvOCeOaJU7OGg2VP8A@mail.gmail.com> (raw)
In-Reply-To: <1429632194-13445-1-git-send-email-dvlasenk@redhat.com>

On Tue, Apr 21, 2015 at 12:03 PM, Denys Vlasenko <dvlasenk@redhat.com> wrote:
> Siggested by Brian Gerst.

Suggested

>
> Run-tested.
>
> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
> CC: Linus Torvalds <torvalds@linux-foundation.org>
> CC: Steven Rostedt <rostedt@goodmis.org>
> CC: Ingo Molnar <mingo@kernel.org>
> CC: Borislav Petkov <bp@alien8.de>
> CC: "H. Peter Anvin" <hpa@zytor.com>
> CC: Andy Lutomirski <luto@amacapital.net>
> CC: Oleg Nesterov <oleg@redhat.com>
> CC: Frederic Weisbecker <fweisbec@gmail.com>
> CC: Alexei Starovoitov <ast@plumgrid.com>
> CC: Will Drewry <wad@chromium.org>
> CC: Kees Cook <keescook@chromium.org>
> CC: x86@kernel.org
> CC: linux-kernel@vger.kernel.org
> ---
>
> Changes in v2: fixed "suggested by", I remebered it wrongly.
>
>  arch/x86/kernel/entry_64.S | 23 +++++------------------
>  1 file changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
> index c7b2384..3bdfdcd 100644
> --- a/arch/x86/kernel/entry_64.S
> +++ b/arch/x86/kernel/entry_64.S
> @@ -524,40 +524,27 @@ GLOBAL(stub_execveat)
>         CFI_ENDPROC
>  END(stub_execveat)
>
> -#ifdef CONFIG_X86_X32_ABI
> +#if defined(CONFIG_X86_X32_ABI) || defined(CONFIG_IA32_EMULATION)
>         .align  8
>  GLOBAL(stub_x32_execve)
> +GLOBAL(stub32_execve)
>         CFI_STARTPROC
>         DEFAULT_FRAME 0, 8
>         call    compat_sys_execve
>         jmp     return_from_execve
>         CFI_ENDPROC
> +END(stub32_execve)
>  END(stub_x32_execve)
>         .align  8
>  GLOBAL(stub_x32_execveat)
> -       CFI_STARTPROC
> -       DEFAULT_FRAME 0, 8
> -       call    compat_sys_execveat
> -       jmp     return_from_execve
> -       CFI_ENDPROC
> -END(stub_x32_execveat)
> -#endif
> -
> -#ifdef CONFIG_IA32_EMULATION
> -       .align  8
> -GLOBAL(stub32_execve)
> -       CFI_STARTPROC
> -       call    compat_sys_execve
> -       jmp     return_from_execve
> -       CFI_ENDPROC
> -END(stub32_execve)
> -       .align  8
>  GLOBAL(stub32_execveat)
>         CFI_STARTPROC
> +       DEFAULT_FRAME 0, 8
>         call    compat_sys_execveat
>         jmp     return_from_execve
>         CFI_ENDPROC
>  END(stub32_execveat)
> +END(stub_x32_execveat)
>  #endif
>
>  /*

I don't think it's necessary to keep both labels.  Just use one and
change the syscall tables accordingly.  Otherwise, looks good.

--
Brian Gerst

  parent reply	other threads:[~2015-04-22 14:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-21 16:03 Denys Vlasenko
2015-04-21 16:03 ` [PATCH v2] x86/asm/entry/32: Update ENOSYS handling to match 64-bit logic Denys Vlasenko
2015-04-22 14:11   ` [tip:x86/asm] x86/asm/entry/32: Update -ENOSYS handling to match the " tip-bot for Denys Vlasenko
2015-04-22 14:07 ` Brian Gerst [this message]
2015-04-22 14:11 ` [tip:x86/asm] x86/asm/entry/64: Merge 32-bit execve stubs with x32 ones, as they are identical tip-bot for Denys Vlasenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAMzpN2iSs2MdKLFw=oFTe0OFBSKUjMvSAvOCeOaJU7OGg2VP8A@mail.gmail.com' \
    --to=brgerst@gmail.com \
    --cc=ast@plumgrid.com \
    --cc=bp@alien8.de \
    --cc=dvlasenk@redhat.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mingo@kernel.org \
    --cc=oleg@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=torvalds@linux-foundation.org \
    --cc=wad@chromium.org \
    --cc=x86@kernel.org \
    --subject='Re: [PATCH v2] x86/asm/entry/64: 32-bit execve stubs are identical to x32 ones, merge them.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).