From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org
Cc: jgross@suse.com, Boris Ostrovsky <boris.ostrovsky@oracle.com>
Subject: [PATCH v2 1/2] xen/PVH: Set up GS segment for stack canary
Date: Wed, 9 May 2018 16:33:17 -0400 [thread overview]
Message-ID: <20180509203318.2611-2-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <20180509203318.2611-1-boris.ostrovsky@oracle.com>
We are making calls to C code (e.g. xen_prepare_pvh()) which may use
stack canary (stored in GS segment).
(We have to set the segment base to @canary at runtime just like
head_32.S does, from where the code fragment is taken)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
arch/x86/xen/xen-pvh.S | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/xen/xen-pvh.S
index e1a5fbe..22d43eb 100644
--- a/arch/x86/xen/xen-pvh.S
+++ b/arch/x86/xen/xen-pvh.S
@@ -54,6 +54,9 @@
* charge of setting up it's own stack, GDT and IDT.
*/
+#define PVH_GDT_ENTRY_CANARY 4
+#define PVH_CANARY_SEL (PVH_GDT_ENTRY_CANARY * 8)
+
ENTRY(pvh_start_xen)
cld
@@ -64,6 +67,17 @@ ENTRY(pvh_start_xen)
mov %eax,%es
mov %eax,%ss
+ /* Set base address in stack canary descriptor. */
+ movl _pa(gdt_start),%eax
+ movl $_pa(canary),%ecx
+ movw %cx, (PVH_GDT_ENTRY_CANARY * 8) + 0(%eax)
+ shrl $16, %ecx
+ movb %cl, (PVH_GDT_ENTRY_CANARY * 8) + 2(%eax)
+ movb %ch, (PVH_GDT_ENTRY_CANARY * 8) + 5(%eax)
+
+ mov $PVH_CANARY_SEL,%eax
+ mov %eax,%gs
+
/* Stash hvm_start_info. */
mov $_pa(pvh_start_info), %edi
mov %ebx, %esi
@@ -150,9 +164,12 @@ gdt_start:
.quad GDT_ENTRY(0xc09a, 0, 0xfffff) /* __KERNEL_CS */
#endif
.quad GDT_ENTRY(0xc092, 0, 0xfffff) /* __KERNEL_DS */
+ .quad GDT_ENTRY(0x4090, 0, 0x18) /* PVH_CANARY_SEL */
gdt_end:
- .balign 4
+ .balign 16
+canary:
+ .fill 24, 1, 0
early_stack:
.fill 256, 1, 0
early_stack_end:
--
2.9.3
next prev parent reply other threads:[~2018-05-09 20:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 20:33 [PATCH v2 0/2] PVH GDT fixes Boris Ostrovsky
2018-05-09 20:33 ` Boris Ostrovsky [this message]
2018-05-14 12:50 ` [Xen-devel] [PATCH v2 1/2] xen/PVH: Set up GS segment for stack canary Jan Beulich
2018-05-14 18:27 ` Boris Ostrovsky
2018-05-09 20:33 ` [PATCH v2 2/2] xen/PVH: Make GDT selectors PVH-specific Boris Ostrovsky
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=20180509203318.2611-2-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xenproject.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).