From: Stefan Bader Date: Fri, 15 Aug 2014 08:57:46 +0000 (+0200) Subject: x86_32, entry: Clean up sysenter_badsys declaration X-Git-Tag: v2.6.32.64~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f03fddc990db7624b7576332b57b9724862657;p=thirdparty%2Fkernel%2Fstable.git 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 Link: http://lkml.kernel.org/r/1408093066-31021-1-git-send-email-stefan.bader@canonical.com Acked-by: Andy Lutomirski Signed-off-by: H. Peter Anvin (cherry picked from commit fb21b84e7f809ef04b1e5aed5d463cf0d4866638) Signed-off-by: Willy Tarreau --- diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 3188ca4b4b3a6..8b5370c287d8d 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -710,7 +710,7 @@ END(syscall_badsys) sysenter_badsys: movl $-ENOSYS,%eax jmp sysenter_after_call -END(syscall_badsys) +END(sysenter_badsys) CFI_ENDPROC /*