From: Thomas Garnier <thgarnie@google.com>
To: kernel-hardening@lists.openwall.com
Cc: Thomas Garnier <thgarnie@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 09/27] x86/acpi: Adapt assembly for PIE support
Date: Mon, 25 Jun 2018 15:38:57 -0700 [thread overview]
Message-ID: <20180625224014.134829-10-thgarnie@google.com> (raw)
In-Reply-To: <20180625224014.134829-1-thgarnie@google.com>
Change the assembly code to use only relative references of symbols for the
kernel to be PIE compatible.
Position Independent Executable (PIE) support will allow to extend the
KASLR randomization range 0xffffffff80000000.
Signed-off-by: Thomas Garnier <thgarnie@google.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
arch/x86/kernel/acpi/wakeup_64.S | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 50b8ed0317a3..472659c0f811 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -14,7 +14,7 @@
* Hooray, we are in Long 64-bit mode (but still running in low memory)
*/
ENTRY(wakeup_long64)
- movq saved_magic, %rax
+ movq saved_magic(%rip), %rax
movq $0x123456789abcdef0, %rdx
cmpq %rdx, %rax
jne bogus_64_magic
@@ -25,14 +25,14 @@ ENTRY(wakeup_long64)
movw %ax, %es
movw %ax, %fs
movw %ax, %gs
- movq saved_rsp, %rsp
+ movq saved_rsp(%rip), %rsp
- movq saved_rbx, %rbx
- movq saved_rdi, %rdi
- movq saved_rsi, %rsi
- movq saved_rbp, %rbp
+ movq saved_rbx(%rip), %rbx
+ movq saved_rdi(%rip), %rdi
+ movq saved_rsi(%rip), %rsi
+ movq saved_rbp(%rip), %rbp
- movq saved_rip, %rax
+ movq saved_rip(%rip), %rax
jmp *%rax
ENDPROC(wakeup_long64)
@@ -45,7 +45,7 @@ ENTRY(do_suspend_lowlevel)
xorl %eax, %eax
call save_processor_state
- movq $saved_context, %rax
+ leaq saved_context(%rip), %rax
movq %rsp, pt_regs_sp(%rax)
movq %rbp, pt_regs_bp(%rax)
movq %rsi, pt_regs_si(%rax)
@@ -64,13 +64,14 @@ ENTRY(do_suspend_lowlevel)
pushfq
popq pt_regs_flags(%rax)
- movq $.Lresume_point, saved_rip(%rip)
+ leaq .Lresume_point(%rip), %rax
+ movq %rax, saved_rip(%rip)
- movq %rsp, saved_rsp
- movq %rbp, saved_rbp
- movq %rbx, saved_rbx
- movq %rdi, saved_rdi
- movq %rsi, saved_rsi
+ movq %rsp, saved_rsp(%rip)
+ movq %rbp, saved_rbp(%rip)
+ movq %rbx, saved_rbx(%rip)
+ movq %rdi, saved_rdi(%rip)
+ movq %rsi, saved_rsi(%rip)
addq $8, %rsp
movl $3, %edi
@@ -82,7 +83,7 @@ ENTRY(do_suspend_lowlevel)
.align 4
.Lresume_point:
/* We don't restore %rax, it must be 0 anyway */
- movq $saved_context, %rax
+ leaq saved_context(%rip), %rax
movq saved_context_cr4(%rax), %rbx
movq %rbx, %cr4
movq saved_context_cr3(%rax), %rbx
--
2.18.0.rc2.346.g013aa6912e-goog
next prev parent reply other threads:[~2018-06-25 22:41 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 22:38 [PATCH v5 00/27] x86: PIE support and option to extend KASLR randomization Thomas Garnier via Virtualization
2018-06-25 22:38 ` Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 01/27] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 02/27] x86: Use symbol name on bug table " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 03/27] x86: Use symbol name in jump " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 04/27] x86: Add macro to get symbol address " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 05/27] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 06/27] x86/entry/64: " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 07/27] x86: pm-trace - " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 08/27] x86/CPU: " Thomas Garnier
2018-06-25 22:38 ` Thomas Garnier [this message]
2018-06-25 22:38 ` [PATCH v5 10/27] x86/boot/64: " Thomas Garnier
2018-06-25 22:38 ` [PATCH v5 11/27] x86/power/64: " Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 12/27] x86/paravirt: " Thomas Garnier
2018-06-25 22:39 ` Thomas Garnier via Virtualization
2018-06-25 22:39 ` [PATCH v5 13/27] x86/boot/64: Build head64.c as mcmodel large when PIE is enabled Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 14/27] x86/percpu: Adapt percpu for PIE support Thomas Garnier
2018-06-25 22:39 ` Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 15/27] compiler: Option to default to hidden symbols Thomas Garnier
2018-06-25 22:39 ` Thomas Garnier
2018-06-25 23:25 ` Randy Dunlap
2018-06-25 23:25 ` Randy Dunlap
2018-06-25 22:39 ` [PATCH v5 16/27] compiler: Option to add PROVIDE_HIDDEN replacement for weak symbols Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 17/27] x86/relocs: Handle PIE relocations Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 18/27] xen: Adapt assembly for PIE support Thomas Garnier
2018-06-25 22:39 ` Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 19/27] kvm: " Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 20/27] x86: Support global stack cookie Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 21/27] x86/ftrace: Adapt function tracing for PIE support Thomas Garnier
2018-06-26 15:21 ` Steven Rostedt
2018-06-25 22:39 ` [PATCH v5 22/27] x86/modules: Add option to start module section after kernel Thomas Garnier
2018-06-25 22:39 ` Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 23/27] x86/modules: Adapt module loading for PIE support Thomas Garnier
2018-06-25 23:51 ` Randy Dunlap
2018-06-25 23:53 ` Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 24/27] x86/mm: Make the x86 GOT read-only Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 25/27] x86/pie: Add option to build the kernel as PIE Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 26/27] x86/relocs: Add option to generate 64-bit relocations Thomas Garnier
2018-06-25 22:39 ` [PATCH v5 27/27] x86/kaslr: Add option to extend KASLR range from 1GB to 3GB Thomas Garnier
2018-06-25 23:41 ` Randy Dunlap
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=20180625224014.134829-10-thgarnie@google.com \
--to=thgarnie@google.com \
--cc=hpa@zytor.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.