[PATCH] x86_32, entry: Clean up sysenter_badsys declaration

[PATCH] x86_32, entry: Clean up sysenter_badsys declaration

[Stefan Bader]

commit 554086d85e "x86_32, entry: Do syscall exit work on badsys
(CVE-2014-4508)" introduced a new jump label (sysenter_badsys) but
somehow the END statements seem to have gone wrong (at least it
feels that way to me).
This does not seem to be a fatal problem, but just for the sake
of symmetry, change the second syscall_badsys to sysenter_badsys.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 arch/x86/kernel/entry_32.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 47c410d..4b0e1df 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -683,7 +683,7 @@ END(syscall_badsys)
 sysenter_badsys:
 	movl $-ENOSYS,%eax
 	jmp sysenter_after_call
-END(syscall_badsys)
+END(sysenter_badsys)
 	CFI_ENDPROC
 
 .macro FIXUP_ESPFIX_STACK
-- 
1.9.1

Re: [PATCH] x86_32, entry: Clean up sysenter_badsys declaration

[Andy Lutomirski]

On Fri, Aug 15, 2014 at 1:57 AM, Stefan Bader
<stefan.bader@canonical.com> wrote:
> commit 554086d85e "x86_32, entry: Do syscall exit work on badsys
> (CVE-2014-4508)" introduced a new jump label (sysenter_badsys) but
> somehow the END statements seem to have gone wrong (at least it
> feels that way to me).
> This does not seem to be a fatal problem, but just for the sake
> of symmetry, change the second syscall_badsys to sysenter_badsys.

Acked-by: Andy Lutomirski <luto@amacapital.net>

hpa, can you pick up one of the several variants of this patch that
are floating around?  AFAIK nothing cares about the sizes of these
symbols, but the current code is clearly wrong even if it's harmless.

--Andy

>
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  arch/x86/kernel/entry_32.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
> index 47c410d..4b0e1df 100644
> --- a/arch/x86/kernel/entry_32.S
> +++ b/arch/x86/kernel/entry_32.S
> @@ -683,7 +683,7 @@ END(syscall_badsys)
>  sysenter_badsys:
>         movl $-ENOSYS,%eax
>         jmp sysenter_after_call
> -END(syscall_badsys)
> +END(sysenter_badsys)
>         CFI_ENDPROC
>
>  .macro FIXUP_ESPFIX_STACK
> --
> 1.9.1
>



-- 
Andy Lutomirski
AMA Capital Management, LLC

[tip:x86/urgent] x86_32, entry: Clean up sysenter_badsys declaration

[tip-bot for Stefan Bader]

Commit-ID:  fb21b84e7f809ef04b1e5aed5d463cf0d4866638
Gitweb:     http://git.kernel.org/tip/fb21b84e7f809ef04b1e5aed5d463cf0d4866638
Author:     Stefan Bader <stefan.bader@canonical.com>
AuthorDate: Fri, 15 Aug 2014 10:57:46 +0200
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 15 Aug 2014 13:45:32 -0700

x86_32, entry: Clean up sysenter_badsys declaration

commit 554086d85e "x86_32, entry: Do syscall exit work on badsys
(CVE-2014-4508)" introduced a new jump label (sysenter_badsys) but
somehow the END statements seem to have gone wrong (at least it
feels that way to me).
This does not seem to be a fatal problem, but just for the sake
of symmetry, change the second syscall_badsys to sysenter_badsys.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Link: http://lkml.kernel.org/r/1408093066-31021-1-git-send-email-stefan.bader@canonical.com
Acked-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/kernel/entry_32.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 47c410d..4b0e1df 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -683,7 +683,7 @@ END(syscall_badsys)
 sysenter_badsys:
 	movl $-ENOSYS,%eax
 	jmp sysenter_after_call
-END(syscall_badsys)
+END(sysenter_badsys)
 	CFI_ENDPROC
 
 .macro FIXUP_ESPFIX_STACK