From: Anish Bhatt <anish@chelsio.com>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, sebastian@fds-team.de,
Anish Bhatt <anish@chelsio.com>
Subject: [PATCH] x86 : Ensure X86_FLAGS_NT is cleared on syscall entry
Date: Thu, 25 Sep 2014 12:42:51 -0700 [thread overview]
Message-ID: <1411674171-24442-1-git-send-email-anish@chelsio.com> (raw)
The MSR_SYSCALL_MASK, which is responsible for clearing specific EFLAGS on
syscall entry, should also clear the nested task (NT) flag to be safe from
userspace injection. Without this fix the application segmentation
faults on syscall return because of the changed meaning of the IRET
instruction.
Further details can be seen here https://bugs.winehq.org/show_bug.cgi?id=33275
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
arch/x86/kernel/cpu/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index e4ab2b4..3126558 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1184,7 +1184,7 @@ void syscall_init(void)
/* Flags to clear on syscall */
wrmsrl(MSR_SYSCALL_MASK,
X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|
- X86_EFLAGS_IOPL|X86_EFLAGS_AC);
+ X86_EFLAGS_IOPL|X86_EFLAGS_AC|X86_EFLAGS_NT);
}
/*
--
2.1.0
next reply other threads:[~2014-09-25 19:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 19:42 Anish Bhatt [this message]
2014-09-25 23:00 ` Chuck Ebbert
2014-09-29 17:30 ` Andy Lutomirski
2014-09-26 22:00 ` Chuck Ebbert
2014-09-26 22:10 ` Anish Bhatt
2014-09-26 23:32 ` Linus Torvalds
2014-09-29 17:40 ` Andy Lutomirski
2014-09-29 18:30 ` Sebastian Lackner
2014-09-29 18:43 ` Andy Lutomirski
2014-09-29 19:33 ` Thomas Gleixner
2014-09-29 19:41 ` Sebastian Lackner
2014-09-29 19:51 ` Thomas Gleixner
2014-09-29 18:59 ` Thomas Gleixner
2014-09-29 19:08 ` Andy Lutomirski
2014-09-29 19:17 ` Andy Lutomirski
2014-09-29 19:41 ` Thomas Gleixner
2014-09-29 19:43 ` H. Peter Anvin
2014-09-29 19:57 ` Thomas Gleixner
2014-09-29 20:01 ` H. Peter Anvin
2014-09-29 20:10 ` Thomas Gleixner
2014-09-29 20:29 ` Andy Lutomirski
2014-09-29 20:16 ` Andy Lutomirski
2014-09-29 21:37 ` Thomas Gleixner
2014-09-30 0:11 ` Andy Lutomirski
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=1411674171-24442-1-git-send-email-anish@chelsio.com \
--to=anish@chelsio.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sebastian@fds-team.de \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®