From: Borislav Petkov <bp@alien8.de>
To: Thomas Garnier <thgarnie@chromium.org>
Cc: kernel-hardening@lists.openwall.com, kristen@linux.intel.com,
keescook@chromium.org, Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v9 04/11] x86/entry/64: Adapt assembly for PIE support
Date: Mon, 5 Aug 2019 19:28:54 +0200 [thread overview]
Message-ID: <20190805172854.GF18785@zn.tnic> (raw)
In-Reply-To: <20190730191303.206365-5-thgarnie@chromium.org>
On Tue, Jul 30, 2019 at 12:12:48PM -0700, Thomas Garnier wrote:
> 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@chromium.org>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> ---
> arch/x86/entry/entry_64.S | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
> index 3f5a978a02a7..4b588a902009 100644
> --- a/arch/x86/entry/entry_64.S
> +++ b/arch/x86/entry/entry_64.S
> @@ -1317,7 +1317,8 @@ ENTRY(error_entry)
> movl %ecx, %eax /* zero extend */
> cmpq %rax, RIP+8(%rsp)
> je .Lbstep_iret
> - cmpq $.Lgs_change, RIP+8(%rsp)
> + leaq .Lgs_change(%rip), %rcx
> + cmpq %rcx, RIP+8(%rsp)
> jne .Lerror_entry_done
>
> /*
> @@ -1514,10 +1515,10 @@ ENTRY(nmi)
> * resume the outer NMI.
> */
>
> - movq $repeat_nmi, %rdx
> + leaq repeat_nmi(%rip), %rdx
> cmpq 8(%rsp), %rdx
> ja 1f
> - movq $end_repeat_nmi, %rdx
> + leaq end_repeat_nmi(%rip), %rdx
> cmpq 8(%rsp), %rdx
> ja nested_nmi_out
> 1:
> @@ -1571,7 +1572,8 @@ nested_nmi:
> pushq %rdx
> pushfq
> pushq $__KERNEL_CS
> - pushq $repeat_nmi
> + leaq repeat_nmi(%rip), %rdx
> + pushq %rdx
>
> /* Put stack back */
> addq $(6*8), %rsp
> @@ -1610,7 +1612,11 @@ first_nmi:
> addq $8, (%rsp) /* Fix up RSP */
> pushfq /* RFLAGS */
> pushq $__KERNEL_CS /* CS */
> - pushq $1f /* RIP */
> + pushq $0 /* Future return address */
> + pushq %rax /* Save RAX */
> + leaq 1f(%rip), %rax /* RIP */
> + movq %rax, 8(%rsp) /* Put 1f on return address */
> + popq %rax /* Restore RAX */
Can't you just use a callee-clobbered reg here instead of preserving
%rax?
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2019-08-05 17:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 19:12 [PATCH v9 00/11] x86: PIE support to extend KASLR randomization Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 01/11] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2019-08-05 16:32 ` Borislav Petkov
2019-08-05 16:54 ` Kees Cook
2019-08-05 17:27 ` Borislav Petkov
2019-08-05 17:53 ` Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 02/11] x86: Add macro to get symbol address " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 03/11] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 04/11] x86/entry/64: " Thomas Garnier
2019-08-05 17:28 ` Borislav Petkov [this message]
2019-08-05 17:50 ` Thomas Garnier
2019-08-06 5:08 ` Borislav Petkov
2019-08-06 8:30 ` Peter Zijlstra
2019-08-06 12:35 ` Borislav Petkov
2019-08-06 13:59 ` Steven Rostedt
2019-08-06 15:35 ` Borislav Petkov
2019-07-30 19:12 ` [PATCH v9 05/11] x86: pm-trace - " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 06/11] x86/CPU: " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 07/11] x86/acpi: " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 08/11] x86/boot/64: " Thomas Garnier
2019-08-09 17:30 ` Borislav Petkov
2019-10-29 21:29 ` Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 09/11] x86/power/64: " Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 10/11] x86/paravirt: " Thomas Garnier
2019-07-31 12:53 ` Peter Zijlstra
2019-08-12 12:55 ` Borislav Petkov
2019-10-29 21:30 ` Thomas Garnier
2019-07-30 19:12 ` [PATCH v9 11/11] x86/alternatives: " Thomas Garnier
2019-08-12 13:57 ` Borislav Petkov
2019-10-29 21:31 ` Thomas Garnier
2019-08-06 15:43 ` [PATCH v9 00/11] x86: PIE support to extend KASLR randomization Borislav Petkov
2019-08-06 15:50 ` Peter Zijlstra
2019-08-29 19:55 ` Thomas Garnier
2019-09-06 23:22 ` Thomas Garnier
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=20190805172854.GF18785@zn.tnic \
--to=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=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=thgarnie@chromium.org \
--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).