From: Kees Cook <keescook@chromium.org>
To: Thomas Garnier <thgarnie@chromium.org>
Cc: kernel-hardening@lists.openwall.com, kristen@linux.intel.com,
Thomas Garnier <thgarnie@google.com>, 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: Re: [PATCH v7 10/12] x86/power/64: Adapt assembly for PIE support
Date: Mon, 10 Jun 2019 16:52:32 -0700 [thread overview]
Message-ID: <201906101652.94483CD@keescook> (raw)
In-Reply-To: <20190520231948.49693-11-thgarnie@chromium.org>
On Mon, May 20, 2019 at 04:19:35PM -0700, Thomas Garnier wrote:
> From: Thomas Garnier <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 below 0xffffffff80000000.
>
> Signed-off-by: Thomas Garnier <thgarnie@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 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 3008baa2fa95..9ed980efef72 100644
> --- a/arch/x86/power/hibernate_asm_64.S
> +++ b/arch/x86/power/hibernate_asm_64.S
> @@ -24,7 +24,7 @@
> #include <asm/frame.h>
>
> ENTRY(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)
> @@ -115,7 +115,7 @@ ENTRY(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.21.0.1020.gf2820cf01a-goog
>
--
Kees Cook
next prev parent reply other threads:[~2019-06-10 23:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 23:19 [PATCH v7 00/12] x86: PIE support to extend KASLR randomization Thomas Garnier
2019-05-20 23:19 ` Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 01/12] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2019-05-21 4:06 ` Eric Biggers
2019-05-22 20:47 ` Thomas Garnier
2019-05-22 20:55 ` Eric Biggers
2019-05-29 15:48 ` Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 02/12] x86: Use symbol name in jump table " Thomas Garnier
2019-05-20 23:23 ` Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 03/12] x86: Add macro to get symbol address " Thomas Garnier
2019-05-21 3:12 ` hpa
2019-05-22 15:57 ` Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 04/12] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2019-06-10 21:33 ` Kees Cook
2019-05-20 23:19 ` [PATCH v7 05/12] x86/entry/64: " Thomas Garnier
2019-06-10 21:34 ` Kees Cook
2019-05-20 23:19 ` [PATCH v7 06/12] x86: pm-trace - " Thomas Garnier
2019-06-10 21:34 ` Kees Cook
2019-05-20 23:19 ` [PATCH v7 07/12] x86/CPU: " Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 08/12] x86/acpi: " Thomas Garnier
2019-06-10 23:52 ` Kees Cook
2019-05-20 23:19 ` [PATCH v7 09/12] x86/boot/64: " Thomas Garnier
2019-06-10 22:26 ` Kees Cook
2019-05-20 23:19 ` [PATCH v7 10/12] x86/power/64: " Thomas Garnier
2019-06-10 23:52 ` Kees Cook [this message]
2019-05-20 23:19 ` [PATCH v7 11/12] x86/paravirt: " Thomas Garnier
2019-05-20 23:19 ` Thomas Garnier
2019-05-27 5:47 ` Juergen Gross
2019-05-27 5:47 ` Juergen Gross
2019-05-29 15:48 ` Thomas Garnier
2019-05-29 15:48 ` Thomas Garnier
2019-05-20 23:19 ` [PATCH v7 12/12] x86/alternatives: " Thomas Garnier
2019-06-10 21:32 ` [PATCH v7 00/12] x86: PIE support to extend KASLR randomization Kees Cook
2019-06-10 21:32 ` Kees Cook
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=201906101652.94483CD@keescook \
--to=keescook@chromium.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--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=thgarnie@chromium.org \
--cc=thgarnie@google.com \
--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.