From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Jan Beulich <JBeulich@suse.com>
Subject: [PATCH 2/7] x86/traps: Poison unused stack pointers in the TSS
Date: Tue, 2 May 2017 19:05:21 +0100 [thread overview]
Message-ID: <1493748326-9582-3-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1493748326-9582-1-git-send-email-andrew.cooper3@citrix.com>
This is for additional defence-in-depth following LDT/GDT/IDT corruption.
It causes attempted control transfers to ring 1 or 2 (via a call gate), or
attempts to use IST 3 through 7 to yield #SS[0], rather than executing with a
stack starting at the top of virtual address space.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
xen/arch/x86/cpu/common.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 6c27008..8796568 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -645,6 +645,14 @@ void load_system_tables(void)
tss->ist[IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE;
tss->ist[IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE;
+ /* Poision all other stack pointers to prevent their accidental use. */
+ tss->rsp1 = 0x8600111111111111ul;
+ tss->rsp2 = 0x8600222222222222ul;
+ tss->ist[3] = 0x8600444444444444ul;
+ tss->ist[4] = 0x8600555555555555ul;
+ tss->ist[5] = 0x8600666666666666ul;
+ tss->ist[6] = 0x8600777777777777ul;
+
_set_tssldt_desc(
gdt + TSS_ENTRY,
(unsigned long)tss,
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-05-02 18:05 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 18:05 [PATCH 0/7] XSAs 213-315 followups Andrew Cooper
2017-05-02 18:05 ` [PATCH 1/7] x86/traps: Drop 32bit fields out of tss_struct Andrew Cooper
2017-05-03 8:10 ` Jan Beulich
2017-05-03 12:33 ` Andrew Cooper
2017-05-03 9:48 ` Wei Liu
2017-05-02 18:05 ` Andrew Cooper [this message]
2017-05-03 8:14 ` [PATCH 2/7] x86/traps: Poison unused stack pointers in the TSS Jan Beulich
2017-05-03 12:47 ` Andrew Cooper
2017-05-03 13:29 ` [PATCH v2 " Andrew Cooper
2017-05-03 13:45 ` Jan Beulich
2017-05-02 18:05 ` [PATCH 3/7] x86/mm: Further restrict permissions on some virtual mappings Andrew Cooper
2017-05-03 8:49 ` Jan Beulich
2017-05-03 13:38 ` Andrew Cooper
2017-05-03 13:48 ` Jan Beulich
2017-05-03 9:48 ` Wei Liu
2017-05-03 10:11 ` Tim Deegan
2017-05-03 11:13 ` George Dunlap
2017-05-02 18:05 ` [PATCH 4/7] x86/traps: Rename compat_hypercall() to entry_int82() Andrew Cooper
2017-05-03 8:55 ` Jan Beulich
2017-05-03 13:41 ` Andrew Cooper
2017-05-02 18:05 ` [PATCH 5/7] x86/traps: Lift all non-entrypoint logic in entry_int82() up into C Andrew Cooper
2017-05-03 9:02 ` Jan Beulich
2017-05-03 11:26 ` Wei Liu
2017-05-03 11:38 ` Andrew Cooper
2017-05-03 11:43 ` Wei Liu
2017-05-03 12:02 ` Jan Beulich
2017-05-03 12:18 ` Andrew Cooper
2017-05-03 12:37 ` Jan Beulich
2017-05-03 18:29 ` Andrew Cooper
2017-05-04 7:27 ` Jan Beulich
2017-05-04 9:27 ` Andrew Cooper
2017-05-04 9:36 ` Jan Beulich
2017-05-04 9:57 ` Andrew Cooper
2017-05-03 12:00 ` Jan Beulich
2017-05-04 10:01 ` [PATCH v2 " Andrew Cooper
2017-05-04 10:16 ` Andrew Cooper
2017-05-04 10:28 ` Jan Beulich
2017-05-04 11:09 ` Andrew Cooper
2017-05-04 10:22 ` Jan Beulich
2017-05-02 18:05 ` [PATCH 6/7] x86/asm: Fold LOAD_C_CLOBBERED into RESTORE_ALL Andrew Cooper
2017-05-03 9:08 ` Jan Beulich
2017-05-03 9:48 ` Wei Liu
2017-05-02 18:05 ` [PATCH 7/7] x86/asm: Clobber %r{8..15} on exit to 32bit PV guests Andrew Cooper
2017-05-03 9:13 ` Jan Beulich
2017-05-03 17:51 ` [PATCH v2 " Andrew Cooper
2017-05-04 8:50 ` Jan Beulich
2017-05-04 11:11 ` [RFC for 4.9] [PATCH 0/7] XSAs 213-315 followups Andrew Cooper
2017-05-04 12:52 ` Julien Grall
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=1493748326-9582-3-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=xen-devel@lists.xen.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;
as well as URLs for NNTP newsgroup(s).