From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123AbcG0IKa (ORCPT ); Wed, 27 Jul 2016 04:10:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:37366 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753952AbcG0IJL (ORCPT ); Wed, 27 Jul 2016 04:09:11 -0400 Date: Wed, 27 Jul 2016 10:09:17 +0200 From: Borislav Petkov To: Kees Cook Cc: Ingo Molnar , Thomas Garnier , Nicolai Stange , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , "linux-tip-commits@vger.kernel.org" , LKML , Linus Torvalds Subject: [PATCH -v2 1/2] x86/asm: Add __PAGE_OFFSET_BASE define on 32-bit Message-ID: <20160727080917.GA3009@nazgul.tnic> References: <20160726095138.3470-1-bp@alien8.de> <20160727054543.GB3142@nazgul.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160727054543.GB3142@nazgul.tnic> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov ... in order to avoid ifdeffery in code computing the ASLR randomization offset. Suggested-by: Kees Cook Signed-off-by: Borislav Petkov --- 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) --