From: tip-bot for Denys Vlasenko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: oleg@redhat.com, ast@plumgrid.com, keescook@chromium.org,
peterz@infradead.org, torvalds@linux-foundation.org,
fweisbec@gmail.com, hpa@zytor.com, rostedt@goodmis.org,
akpm@linux-foundation.org, wad@chromium.org, bp@alien8.de,
linux-kernel@vger.kernel.org, luto@amacapital.net,
dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de
Subject: [tip:x86/asm] x86/asm/entry/32: Reinstate clearing of pt_regs-> r8..r11 on EFAULT path
Date: Mon, 8 Jun 2015 15:24:35 -0700 [thread overview]
Message-ID: <tip-eb47854415825a69b1c578e7487da571227ba25a@git.kernel.org> (raw)
In-Reply-To: <1433701470-28800-1-git-send-email-dvlasenk@redhat.com>
Commit-ID: eb47854415825a69b1c578e7487da571227ba25a
Gitweb: http://git.kernel.org/tip/eb47854415825a69b1c578e7487da571227ba25a
Author: Denys Vlasenko <dvlasenk@redhat.com>
AuthorDate: Sun, 7 Jun 2015 20:24:30 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 8 Jun 2015 23:43:37 +0200
x86/asm/entry/32: Reinstate clearing of pt_regs->r8..r11 on EFAULT path
I broke this recently when I changed pt_regs->r8..r11 clearing
logic in INT 80 code path.
There is a branch from SYSENTER/SYSCALL code to INT 80 code:
if we fail to retrieve arg6, we return EFAULT. Before this
patch, in this case we don't clear pt_regs->r8..r11.
This patch fixes this. The resulting code is smaller and
simpler.
While at it, remove incorrect comment about syscall dispatching
CALL insn: it does not use RIP-relative addressing form (the
comment was meant to be "TODO: make this rip-relative", and
morphed since then, dropping "TODO").
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1433701470-28800-1-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/entry_64_compat.S | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index 59840e3..5757dde 100644
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -413,9 +413,7 @@ END(entry_SYSCALL_compat)
ia32_badarg:
ASM_CLAC
- movq $-EFAULT, %rax
- jmp ia32_sysret
-
+ movq $-EFAULT, RAX(%rsp)
ia32_ret_from_sys_call:
xorl %eax, %eax /* Do not leak kernel information */
movq %rax, R11(%rsp)
@@ -486,9 +484,7 @@ ia32_do_call:
cmpq $(IA32_NR_syscalls-1), %rax
ja 1f
- call *ia32_sys_call_table(, %rax, 8) /* RIP relative */
-
-ia32_sysret:
+ call *ia32_sys_call_table(, %rax, 8)
movq %rax, RAX(%rsp)
1:
jmp int_ret_from_sys_call
prev parent reply other threads:[~2015-06-08 22:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-07 18:24 [PATCH] x86/asm/entry/32: Reinstate clearing of pt_regs->r8..r11 " Denys Vlasenko
2015-06-08 6:50 ` Ingo Molnar
2015-06-08 12:55 ` Denys Vlasenko
2015-06-08 22:24 ` tip-bot for Denys Vlasenko [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-eb47854415825a69b1c578e7487da571227ba25a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=ast@plumgrid.com \
--cc=bp@alien8.de \
--cc=dvlasenk@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=wad@chromium.org \
/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
Powered by JetHome