From patchwork Thu Jun 22 18:06:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9805061 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 36ED660329 for ; Thu, 22 Jun 2017 18:07:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C97B2870B for ; Thu, 22 Jun 2017 18:07:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 211CE2870D; Thu, 22 Jun 2017 18:07:09 +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 753882870B for ; Thu, 22 Jun 2017 18:07:08 +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=674cL/FDuJiyoCU9KNcEO3o3nCWP13tQUoa/fix5i78=; b=tHmG83VflhZczqFo6GFPGySt6S scNb9YbEEVC+f8S9iV25HvQ/vpgEaByUD5EJWyUhXrzG6YzoK+Bm7Q+af5Owg4WYTJf7RsYTKruch /y2KidbKTywGuvfYbtw7V8/ICbqLoC+ntNW/TLPah7Q/wDV1mh9J4g+7wLtoabjUFOE04HiYzJHtm L6SviZgw/fmSZjJk/RHK7NiR3isRoYT8kR4EhM/iMDedU06HS/blrLUUZHdP1v3EgCJ0ytFqjy6Bu n7ZjFBtmH+xD3NXF050mqRpRS+niK8/Mfd5VJlnuY1ysQuabVbYDCLhRpWJ+7Wjwr5AgRmYeFvAkO FV7QTjLw==; 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 1dO6VU-0007K0-Pm; Thu, 22 Jun 2017 18:07:04 +0000 Received: from mail-pf0-x235.google.com ([2607:f8b0:400e:c00::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dO6VS-0007GD-0F for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2017 18:07:03 +0000 Received: by mail-pf0-x235.google.com with SMTP id q86so12108101pfl.3 for ; Thu, 22 Jun 2017 11:06:41 -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=4H66ulum5JhXcHImf4hi47X04RBDTt2zRkkQ2a5Gf8g=; b=GwAXbfqhmIA1sbkE7bAYGpk/tM6SVr7tLQlg46c44CEvc5EOufuUqB6d+02ZRcctyp WwcYvdEeNJyMjmjz76o+JFhPRSAAev9UveEeMZm7VDN3vXZBHRUyQyvxcoqiFjmlHAFl GZeSx2rE1+xI+EvZJEazd9J94ZU4qbvYmOYMI= 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=4H66ulum5JhXcHImf4hi47X04RBDTt2zRkkQ2a5Gf8g=; b=GykRea5vObwcpNiIhHkd5gjMacN8XepBFtfnicSpLSvR7e1IPbg6AS6fNHG4qam6xn JJfbT1x39+MRJe22kX5a/+FHbOfKYcAOvSbk0pG+YsB/OXLM4T6JAzTzuuUAExUvXZ8S yS/jvy2uSIpk/+vN5NDS7eckq9Q5h+2Q4u+xbq80rK6zw8Li/dO3Z05jeIEQmFQ/wv0E fn09ZqUtUmTY7i6w9DHnJW+7Rnj0pLuGyxOKfHiGLXPlrPS1aGonL497BD3SKV4NQeIe PPhGve8P4QE+s/+S7iMtDMn32MdpB7TpQtje2wJIoV01eGNtZ6VNYXQDnAmKwz3GAzpE 8Zxg== X-Gm-Message-State: AKS2vOxpdRpeyiOCBovfqJwwzOhhlfDL4qRLvVvHX0R6XWYxchJ/hheG EmwKbS7o8f6i6RyO X-Received: by 10.84.214.22 with SMTP id h22mr4367667pli.127.1498154800838; Thu, 22 Jun 2017 11:06:40 -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 188sm4456125pgc.49.2017.06.22.11.06.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jun 2017 11:06:39 -0700 (PDT) From: Kees Cook To: Andrew Morton Subject: [PATCH 3/4] powerpc: Reduce ELF_ET_DYN_BASE Date: Thu, 22 Jun 2017 11:06:31 -0700 Message-Id: <1498154792-49952-4-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498154792-49952-1-git-send-email-keescook@chromium.org> References: <1498154792-49952-1-git-send-email-keescook@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170622_110702_082323_C656FA9D X-CRM114-Status: GOOD ( 13.73 ) 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: Pratyush Anand , linux-s390@vger.kernel.org, James Hogan , Kees Cook , Heiko Carstens , kernel-hardening@lists.openwall.com, Catalin Marinas , Will Deacon , Russell King , linux-kernel@vger.kernel.org, Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Ingo Molnar , linux-arm-kernel@lists.infradead.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, position PIE binaries lower 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. 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)