aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Bader <stefan.bader@canonical.com>2014-08-15 10:57:46 +0200
committerStefan Bader <stefan.bader@canonical.com>2014-11-25 15:20:23 +0100
commit5b7b61fb1ec5ab7e436a26e3b4c8a53c3b907f68 (patch)
treed5982924f22e8bd7a34194e09251e897382d1e9b
parenta8a149527405cb04aa378ded4f6014c1c47a32bf (diff)
downloadlinux-2.6.32.y-drm33.z-5b7b61fb1ec5ab7e436a26e3b4c8a53c3b907f68.tar.gz
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> (cherry picked from commit fb21b84e7f809ef04b1e5aed5d463cf0d4866638) Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--arch/x86/kernel/entry_32.S2
1 files changed, 1 insertions, 1 deletions
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
/*