From: Thomas Garnier <thgarnie@chromium.org>
To: kernel-hardening@lists.openwall.com
Cc: kristen@linux.intel.com, keescook@chromium.org,
Thomas Garnier <thgarnie@chromium.org>,
Pavel Machek <pavel@ucw.cz>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v11 09/11] x86/power/64: Adapt assembly for PIE support
Date: Thu, 27 Feb 2020 16:00:54 -0800 [thread overview]
Message-ID: <20200228000105.165012-10-thgarnie@chromium.org> (raw)
In-Reply-To: <20200228000105.165012-1-thgarnie@chromium.org>
Change the assembly code to use only relative references of symbols for the
kernel to be PIE compatible.
Signed-off-by: Thomas Garnier <thgarnie@chromium.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
arch/x86/power/hibernate_asm_64.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S
index 7918b8415f13..977b8ae85045 100644
--- a/arch/x86/power/hibernate_asm_64.S
+++ b/arch/x86/power/hibernate_asm_64.S
@@ -23,7 +23,7 @@
#include <asm/frame.h>
SYM_FUNC_START(swsusp_arch_suspend)
- 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)
@@ -116,7 +116,7 @@ SYM_FUNC_START(restore_registers)
movq %rax, %cr4; # turn PGE back on
/* We don't restore %rax, it must be 0 anyway */
- movq $saved_context, %rax
+ leaq saved_context(%rip), %rax
movq pt_regs_sp(%rax), %rsp
movq pt_regs_bp(%rax), %rbp
movq pt_regs_si(%rax), %rsi
--
2.25.1.481.gfbce0eb801-goog
next prev parent reply other threads:[~2020-02-28 0:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 0:00 [PATCH v11 00/11] x86: PIE support to extend KASLR randomization Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 01/11] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 02/11] x86: Add macro to get symbol address " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 03/11] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 04/11] x86/entry/64: " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 05/11] x86: pm-trace - " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 06/11] x86/CPU: " Thomas Garnier
2020-03-03 4:58 ` Kees Cook
2020-02-28 0:00 ` [PATCH v11 07/11] x86/acpi: " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 08/11] x86/boot/64: " Thomas Garnier
2020-02-28 0:00 ` Thomas Garnier [this message]
2020-02-28 0:00 ` [PATCH v11 10/11] x86/paravirt: " Thomas Garnier
2020-02-28 0:00 ` [PATCH v11 11/11] x86/alternatives: " Thomas Garnier
2020-03-03 4:59 ` Kees Cook
2020-03-03 5:02 ` [PATCH v11 00/11] x86: PIE support to extend KASLR randomization Kees Cook
2020-03-03 9:55 ` Peter Zijlstra
2020-03-03 15:43 ` Thomas Garnier
2020-03-03 21:01 ` Kristen Carlson Accardi
2020-03-03 21:19 ` Kees Cook
2020-03-04 9:21 ` Peter Zijlstra
2020-03-04 18:21 ` Kees Cook
2020-03-04 18:44 ` H. Peter Anvin
2020-03-04 19:19 ` Thomas Garnier
2020-03-04 19:22 ` H. Peter Anvin
2020-03-04 9:40 ` H. Peter Anvin
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=20200228000105.165012-10-thgarnie@chromium.org \
--to=thgarnie@chromium.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kristen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pavel@ucw.cz \
--cc=rafael.j.wysocki@intel.com \
--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 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).