From patchwork Fri Jun 23 20:59:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9807323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D6E960349 for ; Fri, 23 Jun 2017 21:07:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1E7223C7 for ; Fri, 23 Jun 2017 21:06:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE57F2859F; Fri, 23 Jun 2017 21:06:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 56598223C7 for ; Fri, 23 Jun 2017 21:06:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ETUOhr90XOFhgRL3T4btjpTPGIkxfHNbpHD5YoVnilE=; b=BpEcu7SfO2F/4nbaTeWO/0kSPG 6YPvS91h7JDJ8JQTXEXwHrlL/vzl9cJJCRTz1hiUGc5m9acwGPDtSmhXukZEAdx7aSU4tQ0+JLxDa Ai9s7KSWCbAvCmkzHcgx57CwFX5cGD7Y/c7XWiN/t9NCteG8iOsPCfcuMRxNYubBuKNeWIY5eKkCm yFYw9fY2ckdTqP7j2k09BD2s3vPnaFd9EvFY2HWXhHccEpcle8xRC/tGUdThdWWvruQYQkTmVu69b OSpKxS3BLCUXn/vllWyFvkejGG3Uxw8dwew5rQiKfZEpf3wJl05s8yjXkIXsG0ycLRJmrDw8w8O7u YHx4RwHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dOVn4-0001rU-Hz; Fri, 23 Jun 2017 21:06:54 +0000 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dOVgw-0007uw-06 for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2017 21:00:35 +0000 Received: by mail-pf0-x22d.google.com with SMTP id c73so28456224pfk.2 for ; Fri, 23 Jun 2017 14:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aIw6ITh61yuV6ZHkIghtrJuYZeFoE/hWnZV1jzMnnHM=; b=S1XA33WexllScNz7dP76gv6pkCrR/RK1aLLMdc2XP+a74p4QAGGGqk1XFuUeoQGJM2 lpcBXkqW5BoTpAfLRngPjLsQGr/z94sBJRwqNiEO77YgOoOM1aLbL+bdTi51oXF9tg1n S/P8Ewc3qeN4oFTUUMgNYdgZoDg4GPx6thMgc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aIw6ITh61yuV6ZHkIghtrJuYZeFoE/hWnZV1jzMnnHM=; b=F/5K9fHJvUdi3KTeTn7o2ciYJg4hyBUxSTDO69kl+xXODuuFxI8mxVOfJYMB1JuMXv XnWjbobBqiZNJ115diu/l9mZduT/JWSAIwCdcxclno/tFZXY6ZDhGvEtamAD2mGsoRh+ 8xzKEKuCDefkxlwPOpUkdy6pKqv6PU6kj7hShN2GyFtl1HG5W7FqGNERHWt9s7dQhHsr k4FUHCceQsTJFXImmdpEo7wRb9AvP4wql2riyTuGoueRW+O2zH5IJ2C6f8QPP+igDGKc yteiE+zLrVixpOrjZOrq6LTsc4G1mtmXBA2D9yAfSTBHkHgLcPxnvsXOilcJHIhUi8l/ 4Tbw== X-Gm-Message-State: AKS2vOzqS36qX+6u3W00s6JGcsxNl8Stvl0NwV4ITvfDG3Up4CAGF2Yf EiNtA+qHcWrHH9sd X-Received: by 10.98.106.66 with SMTP id f63mr10251031pfc.169.1498251612258; Fri, 23 Jun 2017 14:00:12 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id c6sm6640531pfc.128.2017.06.23.14.00.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 14:00:08 -0700 (PDT) From: Kees Cook To: Andrew Morton Subject: [PATCH v2 4/5] powerpc: Move ELF_ET_DYN_BASE to 4GB / 4MB Date: Fri, 23 Jun 2017 13:59:59 -0700 Message-Id: <1498251600-132458-5-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498251600-132458-1-git-send-email-keescook@chromium.org> References: <1498251600-132458-1-git-send-email-keescook@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170623_140034_068660_D7B82795 X-CRM114-Status: GOOD ( 16.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Grzegorz Andrejczuk , kernel-hardening@lists.openwall.com, Catalin Marinas , Heiko Carstens , Masahiro Yamada , Paul Mackerras , "H. Peter Anvin" , Pratyush Anand , linux-s390@vger.kernel.org, Michael Ellerman , x86@kernel.org, Russell King , Ingo Molnar , Benjamin Herrenschmidt , Qualys Security Advisory , Rik van Riel , James Hogan , Kees Cook , Will Deacon , linux-fsdevel@vger.kernel.org, Alexander Viro , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Dmitry Safonov , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Daniel Micay , Martin Schwidefsky , linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Now that explicitly executed loaders are loaded in the mmap region, we have more freedom to decide where we position PIE binaries in the address space to avoid possible collisions with mmap or stack regions. For 64-bit, align to 4GB to allow runtimes to use the entire 32-bit address space for 32-bit pointers. On 32-bit use 4MB, which is the traditional x86 minimum load location, likely to avoid historically requiring a 4MB page table entry when only a portion of the first 4MB would be used (since the NULL address is avoided). Cc: stable@vger.kernel.org Signed-off-by: Kees Cook Acked-by: Michael Ellerman --- arch/powerpc/include/asm/elf.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 09bde6e34f5d..548d9a411a0d 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h @@ -23,12 +23,13 @@ #define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE -/* This is the location that an ET_DYN program is loaded if exec'ed. Typical - use of this is to invoke "./ld.so someprog" to test out a new version of - the loader. We need to make sure that it is out of the way of the program - that it will "exec", and that there is sufficient room for the brk. */ - -#define ELF_ET_DYN_BASE 0x20000000 +/* + * 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 + * space open for things that want to use the area for 32-bit pointers. + */ +#define ELF_ET_DYN_BASE (is_32bit_task() ? 0x000400000UL : \ + 0x100000000UL) #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)