From patchwork Thu Jun 22 18:06:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9805073 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 58DCA60329 for ; Thu, 22 Jun 2017 18:07:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F02F2870B for ; Thu, 22 Jun 2017 18:07:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4393A2870D; Thu, 22 Jun 2017 18:07:40 +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 BE6572870B for ; Thu, 22 Jun 2017 18:07:39 +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=hPrkkqrq47e6dUJ8fkNR3swQIpnj1XMWsutIn8OoWNw=; b=cB9RKQNAIqfe64E3yj9I2CQfG6 L1If74SlRRtvF/1/BjSYqwOfDvEN4V/0VxZieQuEKyqZi6rPHszNn7IZvwx9pxub8gTfux27/lzGq 8/t9EqDv3VgvMe1xevumdsFeoJCSNvP9rTgrtVbXzFQCNLpowuPzU5e+ZpSt53eIV6QBSzkL3bT9n J1z/kDL8lC2szW2S77IegjxqDrWvWyTL6Uyd0ur6RQZTWmQekVaDk4+4GWhok7Bft/xg6oyLZOM0U TW6zPooG4bCuJqGGr94qNy09Bb8p0oVCHWseN59tC8LgvkdIxfUSaa8ezFrlGTZGUiUUyZwq2Se/x tz5vqYOA==; 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 1dO6W2-000879-FJ; Thu, 22 Jun 2017 18:07:38 +0000 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dO6VT-0007GI-7q for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2017 18:07:05 +0000 Received: by mail-pf0-x230.google.com with SMTP id q86so12108421pfl.3 for ; Thu, 22 Jun 2017 11:06:42 -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=COJafQLePeyG6MzE8Xg6iiTm7M0yyK2qkvVIO1KcABQ=; b=Dgp60xBFFQuEqbBkLczOUYVdl7+gZGNfeF8dp6wWz9xXwHA0tkCpDO4o2lhi6BT+q4 Fu7fuGDRCyweOmb8UXmXlSS1l0XmoLYgK2mYlmUBReFo5maa5de4kVkNcZFXs4fyMpTU YcLF9yUuvHz9DSaSPZUGVo1u5WE0tXqZVvTz4= 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=COJafQLePeyG6MzE8Xg6iiTm7M0yyK2qkvVIO1KcABQ=; b=aWKm0N0kR9KXQRJIv+aSnahZhIhV63WThak3ez1SgM51Hvewlyfz7crzdaGaYRSLAG mExB9Es3JMTac76N5kEdA9+VTc6kI/nD5fRLu4a1nRQlJnSIdKf3tdgZ4o7M74BDAjId z0kmMdoB8dv+aZPgkz8LJ0ADjloe7elpr0bQdwSvrLt80RuXVn0e6N1GHdphu2VOuJO7 Xmb35/z5zxyjF6PU56SGNVEYm/t46T+nigE3LZtfQDe7jjxARynVO4qFoXwrbEHmJac4 8CxNfqqFzvO72q/jZD7B4/Zm/Y9lSMjDAquK3rlaxMax+c41mlHgmjr4FALWxD3lU5Uz MXlw== X-Gm-Message-State: AKS2vOxcmKZtA5GisD09hmXHrfdPYW2yAY+3r4cORpEnH8COhCDpma1G WxZn4gojmaKWmpQn X-Received: by 10.98.36.19 with SMTP id r19mr3989169pfj.162.1498154802133; Thu, 22 Jun 2017 11:06:42 -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 d62sm5601347pga.2.2017.06.22.11.06.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jun 2017 11:06:40 -0700 (PDT) From: Kees Cook To: Andrew Morton Subject: [PATCH 4/4] s390: Reduce ELF_ET_DYN_BASE Date: Thu, 22 Jun 2017 11:06:32 -0700 Message-Id: <1498154792-49952-5-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_110703_302873_D6988B48 X-CRM114-Status: GOOD ( 12.92 ) 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 --- arch/s390/include/asm/elf.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index e8f623041769..7c58d599f91b 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h @@ -161,14 +161,13 @@ extern unsigned int vdso_enabled; #define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE 4096 -/* 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. 64-bit - tasks are aligned to 4GB. */ -#define ELF_ET_DYN_BASE (is_compat_task() ? \ - (STACK_TOP / 3 * 2) : \ - (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1)) +/* + * 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_compat_task() ? 0x000400000UL : \ + 0x100000000UL) /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */