From: tip-bot for Stefan Bader <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: luto@amacapital.net, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, tglx@linutronix.de, hpa@linux.intel.com,
stefan.bader@canonical.com
Subject: [tip:x86/urgent] x86_32, entry: Clean up sysenter_badsys declaration
Date: Fri, 15 Aug 2014 14:19:15 -0700 [thread overview]
Message-ID: <tip-fb21b84e7f809ef04b1e5aed5d463cf0d4866638@git.kernel.org> (raw)
In-Reply-To: <1408093066-31021-1-git-send-email-stefan.bader@canonical.com>
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
prev parent reply other threads:[~2014-08-15 21:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-15 8:57 [PATCH] x86_32, entry: Clean up sysenter_badsys declaration Stefan Bader
2014-08-15 15:42 ` Andy Lutomirski
2014-08-15 21:19 ` tip-bot for Stefan Bader [this message]
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=tip-fb21b84e7f809ef04b1e5aed5d463cf0d4866638@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=stefan.bader@canonical.com \
--cc=tglx@linutronix.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox