Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753360AbdHOTCh (ORCPT ); Tue, 15 Aug 2017 15:02:37 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:33648 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752453AbdHOTCg (ORCPT ); Tue, 15 Aug 2017 15:02:36 -0400 MIME-Version: 1.0 In-Reply-To: References: <20170807201542.GA21271@beast> <20170808093450.GA13355@arm.com> From: Kees Cook Date: Tue, 15 Aug 2017 12:02:34 -0700 X-Google-Sender-Auth: Gb2wPhXt7jqvNIZJwzYjFspjCvE Message-ID: Subject: Re: [PATCH] mm: Revert x86_64 and arm64 ELF_ET_DYN_BASE base To: Andrew Morton Cc: Kostya Serebryany , Will Deacon , Evgeniy Stepanov , Daniel Micay , Dmitry Vyukov , Catalin Marinas , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , "x86@kernel.org" , Pratyush Anand , Dong Bo , Dmitry Safonov , Rik van Riel , Andy Lutomirski , Grzegorz Andrejczuk , "linux-arm-kernel@lists.infradead.org" , Reid Kleckner , Peter Collingbourne , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2768 Lines: 69 ping to akpm to please pick this up for -mm... On Tue, Aug 8, 2017 at 7:00 PM, Kees Cook wrote: > On Tue, Aug 8, 2017 at 2:34 AM, Will Deacon wrote: >> On Mon, Aug 07, 2017 at 01:15:42PM -0700, Kees Cook wrote: >>> Moving the x86_64 and arm64 PIE base from 0x555555554000 to 0x000100000000 >>> broke AddressSanitizer. This is a partial revert of: >>> >>> commit eab09532d400 ("binfmt_elf: use ELF_ET_DYN_BASE only for PIE") >>> commit 02445990a96e ("arm64: move ELF_ET_DYN_BASE to 4GB / 4MB") >>> >>> The AddressSanitizer tool has hard-coded expectations about where >>> executable mappings are loaded. The motivation for changing the PIE >>> base in the above commits was to avoid the Stack-Clash CVEs that >>> allowed executable mappings to get too close to heap and stack. This >>> was mainly a problem on 32-bit, but the 64-bit bases were moved too, >>> in an effort to proactively protect those systems (proofs of concept >>> do exist that show 64-bit collisions, but other recent changes to fix >>> stack accounting and setuid behaviors will minimize the impact). >>> >>> The new 32-bit PIE base is fine for ASan (since it matches the ET_EXEC >>> base), so only the 64-bit PIE base needs to be reverted to let x86 and >>> arm64 ASan binaries run again. Future changes to the 64-bit PIE base on >>> these architectures can be made optional once a more dynamic method for >>> dealing with AddressSanitizer is found. (e.g. always loading PIE into >>> the mmap region for marked binaries.) >>> >>> Reported-by: Kostya Serebryany >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Kees Cook >>> --- >>> arch/arm64/include/asm/elf.h | 4 ++-- >>> arch/x86/include/asm/elf.h | 4 ++-- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h >>> index acae781f7359..3288c2b36731 100644 >>> --- a/arch/arm64/include/asm/elf.h >>> +++ b/arch/arm64/include/asm/elf.h >>> @@ -114,10 +114,10 @@ >>> >>> /* >>> * This is the base location for PIE (ET_DYN with INTERP) loads. On >>> - * 64-bit, this is raised to 4GB to leave the entire 32-bit address >>> + * 64-bit, this is above 4GB to leave the entire 32-bit address >>> * space open for things that want to use the area for 32-bit pointers. >>> */ >>> -#define ELF_ET_DYN_BASE 0x100000000UL >>> +#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3) >>> >>> #ifndef __ASSEMBLY__ >> >> Acked-by: Will Deacon >> >> I assume this is going via akpm like the original commit? > > That's my expectation, yup. Thanks for the Ack! > > -Kees > > -- > Kees Cook > Pixel Security -- Kees Cook Pixel Security