]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
x86_32, entry: Clean up sysenter_badsys declaration
authorStefan Bader <stefan.bader@canonical.com>
Fri, 15 Aug 2014 08:57:46 +0000 (10:57 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 23 Nov 2014 09:55:32 +0000 (10:55 +0100)
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>
(cherry picked from commit fb21b84e7f809ef04b1e5aed5d463cf0d4866638)
Signed-off-by: Willy Tarreau <w@1wt.eu>
arch/x86/kernel/entry_32.S

index 3188ca4b4b3a6862d978f73e1b420e11df78fe2d..8b5370c287d8ddc88dcb1206d70e10614ef6f525 100644 (file)
@@ -710,7 +710,7 @@ END(syscall_badsys)
 sysenter_badsys:
        movl $-ENOSYS,%eax
        jmp sysenter_after_call
-END(syscall_badsys)
+END(sysenter_badsys)
        CFI_ENDPROC
 
 /*