From patchwork Wed Oct 11 20:30:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000557 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 B3D156037F for ; Wed, 11 Oct 2017 20:33:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8BE528B66 for ; Wed, 11 Oct 2017 20:33:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CEAF28B6D; Wed, 11 Oct 2017 20:33:30 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 46DE128B66 for ; Wed, 11 Oct 2017 20:33:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Neu-0000JF-0O; Wed, 11 Oct 2017 20:31:16 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Net-0000Hf-2l for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:15 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 00/0B-02373-29F7ED95; Wed, 11 Oct 2017 20:31:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRWlGSWpSXmKPExsVyMfTAat2J9fc iDe4uVbH4vmUykwOjx+EPV1gCGKNYM/OS8isSWDM2Tp/KXrCDvWL6vtXMDYy72boYuTiEBGYw SnzdOpepi5GTg0XgFYvE29NVIAkJgX5Wib+rb4IlJASyJF7M72OBsNMkrs58yQxhl0scW3SIH cQWElCS2LphKTPE1H+MEnd3/WQFSbAJaEnsaZjPBJIQETghLLHpw29GEIdZ4AyTxPG+k2BVwg L+Evd2rmeHuENVomnWb7A4r4CFxNmudkaIdRYSx44dBjuDU8BS4vvGQ8wQqy0kVs46zzqBUXA BI8MqRo3i1KKy1CJdY0O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAsGMAgh2M TYsCDzFKcjApifI+jLkXKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCd3odUE6wKDU9tSItMwcYA TBpCQ4eJRHeJpA0b3FBYm5xZjpE6hSjPceFO5f+MHHceHgdSB7YcwtIdty8+4dJiCUvPy9VSp y3FKRNAKQtozQPbigsYi8xykoJ8zICnSnEU5BalJtZgir/ilGcg1FJmPcwyBSezLwSuN2vgM5 iAjpLNO0OyFkliQgpqQZG07q6lTsyvIwttPeLJ22p+cfq9X3iobf15iFLA+8Z3mffUhmm9yjz 569Qk7JlDLLvi3luJztP13uUxj/1ynmO/GW7qmb/Y7+8Zdqcc4bVMnyTte96cOuqB0+7/aQ4o GrnlhlTds/sFXhWqSE0977A47jT3cZfZiyby90Qqr6KodVcRuXRzHfOSizFGYmGWsxFxYkA+7 HE7NMCAAA= X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1507753872!51683301!1 X-Originating-IP: [209.85.192.171] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32825 invoked from network); 11 Oct 2017 20:31:13 -0000 Received: from mail-pf0-f171.google.com (HELO mail-pf0-f171.google.com) (209.85.192.171) by server-2.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:13 -0000 Received: by mail-pf0-f171.google.com with SMTP id d28so1958561pfe.2 for ; Wed, 11 Oct 2017 13:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4Ux3JtQIPqcCK2SaoNQKwBMmSaOyLgtI3hVpUoLp8v4=; b=OfhCjzc6PxfK/ZsnB7uJY93JbW28/h/nSAdMucM5M33aCDEoU1CGndOZ5jxGJRYUHq TsuoD7FgqMBowL6qwRdhN0cq9/Ll+scCTjP8MVmuTG+2WphEyxp/KzbY3ZoAayMHgFjq x71l9WRNU2Nn1FA6TNv/KRYU/tSfE2AzKB5+unTND6XXzB8LNsiGTtOnHQ4v+ZSU+p8k CjrH8asjRSjZwsylyn9MX2AG7nzdKKawKePFMYWzqIpq7bdgLDrGc7foPkJ0pn9z092F hsJf3wXYX7ibvzvzlmfV6QgH2miDdJjLS+pIpGfYFk+5+Vev9S2jw/BnAEFAbtfwbE1J b6XA== 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=4Ux3JtQIPqcCK2SaoNQKwBMmSaOyLgtI3hVpUoLp8v4=; b=e3MlcsnMxIIcqhJn+Pd4juWlAd1Ua0MGG7uh9lXz3rCc8QekfCMboHTu0jes0wYIJq A7ILHpO9quTqOULyX904HF0JWv0pPf7M3AEuKqX44MBjTsAYwZsjIKssGfRukfCPwhHH 50ixSLZ14ncXOemzgGqIRN1SeQZKZcVQFot/DgkVLblWVLi/rRisJIKNEuunLhle4E/g RSRf2dmpBd7nGPXMRdjHg5sB57OZWfYNM/1WsS8dSQkj6NS+pUNENWA1MgUpLts64hYA XbQuh6qkFSM/5LswvysZBSqDl7uV7TcHyGy+I3SdgmxcHVNJqqIdayCy0MPB4pDVd8jz hMXw== X-Gm-Message-State: AMCzsaUZ/z/qDINsmv6pH5ctzWPsWYBT27hZOaNYweWpECpPNq8OBumJ tlK+kXwxqaqbEkYGyrGxJcc3SQ== X-Google-Smtp-Source: AOwi7QDlndpEk/IJuLal8k5BAL7v1IvVfKHAsWkG+tU0RnbcQICSZg1yUrvpd+BAR5+Ap+S3omrR+w== X-Received: by 10.98.17.202 with SMTP id 71mr197765pfr.142.1507753871435; Wed, 11 Oct 2017 13:31:11 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id n12sm20691913pfb.149.2017.10.11.13.31.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:10 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 11 Oct 2017 13:30:05 -0700 Message-Id: <20171011203027.11248-6-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-1-thgarnie@google.com> Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH v1 05/27] x86: relocate_kernel - Adapt assembly for PIE support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. Signed-off-by: Thomas Garnier --- arch/x86/kernel/relocate_kernel_64.S | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index 307d3bac5f04..2ecbdcbe985b 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S @@ -200,9 +200,11 @@ identity_mapped: movq %rax, %cr3 lea PAGE_SIZE(%r8), %rsp call swap_pages - movq $virtual_mapped, %rax - pushq %rax - ret + jmp *virtual_mapped_addr(%rip) + + /* Absolute value for PIE support */ +virtual_mapped_addr: + .quad virtual_mapped virtual_mapped: movq RSP(%r8), %rsp