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>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Nadav Amit <namit@vmware.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v8 11/11] x86/alternatives: Adapt assembly for PIE support
Date: Mon, 8 Jul 2019 10:49:04 -0700 [thread overview]
Message-ID: <20190708174913.123308-12-thgarnie@chromium.org> (raw)
In-Reply-To: <20190708174913.123308-1-thgarnie@chromium.org>
Change the assembly options to work with pointers instead of integers.
Position Independent Executable (PIE) support will allow to extend the
KASLR randomization range below 0xffffffff80000000.
Signed-off-by: Thomas Garnier <thgarnie@chromium.org>
---
arch/x86/include/asm/alternative.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 094fbc9c0b1c..28a838106e5f 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -243,7 +243,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
/* Like alternative_io, but for replacing a direct call with another one. */
#define alternative_call(oldfunc, newfunc, feature, output, input...) \
asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \
- : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
+ : output : [old] "X" (oldfunc), [new] "X" (newfunc), ## input)
/*
* Like alternative_call, but there are two features and respective functions.
@@ -256,8 +256,8 @@ static inline int alternatives_text_reserved(void *start, void *end)
asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\
"call %P[new2]", feature2) \
: output, ASM_CALL_CONSTRAINT \
- : [old] "i" (oldfunc), [new1] "i" (newfunc1), \
- [new2] "i" (newfunc2), ## input)
+ : [old] "X" (oldfunc), [new1] "X" (newfunc1), \
+ [new2] "X" (newfunc2), ## input)
/*
* use this macro(s) if you need more than one output parameter
--
2.22.0.410.gd8fdbe21b5-goog
next prev parent reply other threads:[~2019-07-08 17:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 17:48 [PATCH v8 00/11] x86: PIE support to extend KASLR randomization Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 01/11] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 02/11] x86: Add macro to get symbol address " Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 03/11] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 04/11] x86/entry/64: " Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 05/11] x86: pm-trace - " Thomas Garnier
2019-07-08 17:48 ` [PATCH v8 06/11] x86/CPU: " Thomas Garnier
2019-07-08 17:49 ` [PATCH v8 07/11] x86/acpi: " Thomas Garnier
2019-07-08 17:49 ` [PATCH v8 08/11] x86/boot/64: " Thomas Garnier
2019-07-08 17:49 ` [PATCH v8 09/11] x86/power/64: " Thomas Garnier
2019-07-08 17:49 ` [PATCH v8 10/11] x86/paravirt: " Thomas Garnier
2019-07-08 17:49 ` Thomas Garnier [this message]
2019-07-30 18:01 ` [PATCH v8 00/11] x86: PIE support to extend KASLR randomization Kees Cook
2019-07-30 19:09 ` 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=20190708174913.123308-12-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=mingo@redhat.com \
--cc=namit@vmware.com \
--cc=peterz@infradead.org \
--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).