From: Borislav Petkov <bp@suse.de>
To: Kees Cook <keescook@chromium.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Garnier <thgarnie@google.com>,
Nicolai Stange <nicstange@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
"linux-tip-commits@vger.kernel.org"
<linux-tip-commits@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH -v2 1/2] x86/asm: Add __PAGE_OFFSET_BASE define on 32-bit
Date: Wed, 27 Jul 2016 10:09:17 +0200 [thread overview]
Message-ID: <20160727080917.GA3009@nazgul.tnic> (raw)
In-Reply-To: <20160727054543.GB3142@nazgul.tnic>
From: Borislav Petkov <bp@suse.de>
... in order to avoid ifdeffery in code computing the ASLR randomization
offset.
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/include/asm/page_32_types.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 3a52ee0e726d..3bae4969ac65 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -13,7 +13,8 @@
* If you want more physical memory than this then see the CONFIG_HIGHMEM4G
* and CONFIG_HIGHMEM64G options in the kernel configuration.
*/
-#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET_BASE _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET __PAGE_OFFSET_BASE
#define __START_KERNEL_map __PAGE_OFFSET
--
2.8.4
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
next prev parent reply other threads:[~2016-07-27 8:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 9:51 [PATCH] x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY Borislav Petkov
2016-07-26 17:37 ` [tip:x86/microcode] x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y tip-bot for Borislav Petkov
2016-07-26 20:37 ` Kees Cook
2016-07-27 5:45 ` Borislav Petkov
2016-07-27 8:09 ` Borislav Petkov [this message]
2016-07-27 9:05 ` [PATCH -v2 1/2] x86/asm: Add __PAGE_OFFSET_BASE define on 32-bit Ingo Molnar
2016-07-27 9:10 ` Borislav Petkov
2016-07-27 10:36 ` Ingo Molnar
2016-07-27 12:09 ` [PATCH] x86/asm, microcode: " Borislav Petkov
2016-07-27 17:10 ` [tip:x86/microcode] x86/asm, x86/microcode: " tip-bot for Borislav Petkov
2016-07-27 8:11 ` [PATCH -v2 2/2] x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY Borislav Petkov
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=20160727080917.GA3009@nazgul.tnic \
--to=bp@suse.de \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nicstange@gmail.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=thgarnie@google.com \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®