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: 10000527 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 6719C6037F for ; Wed, 11 Oct 2017 20:32:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7A728B37 for ; Wed, 11 Oct 2017 20:32:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CAA228B6A; Wed, 11 Oct 2017 20:32:49 +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 mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 823DE28B37 for ; Wed, 11 Oct 2017 20:32:48 +0000 (UTC) Received: (qmail 14091 invoked by uid 550); 11 Oct 2017 20:31:26 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 14010 invoked from network); 11 Oct 2017 20:31:23 -0000 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=J7NPPhEllWgpkifTH9ZjOY7qm9TQWhTJG+vCSzWci8JariXJeRkkvxF/DGpkIQNTB9 23pPjEwRCUK7UP+aZrgvBfRUgu4jqIMMKwJ6VMP1nbLbFIHenwI6RMZB+bQTjJdMSRSP guPs+HVPJuK5BYtNFZxNEgg99fyoIJCSl87LAnVnMJtM7GLf5XD1yx0tsY6G701IXzdK oJIVel7m5uvTFeBTgw8zG+i6mLQahd5vMMSFwqb1/Rz9vJnWnHOxYuWVhl+2Ze9GV0D6 8rDMsFQQXWBwzRYLeqgpxZIIVSOfRUIsosVesAuIi6DTkPiV+Itl9g4tS/BECQCGdLq2 n/Sg== X-Gm-Message-State: AMCzsaU8PLGuoPaoG5aKCS8EZNOSw/v55Cc/2/s3VXDzJ/UpZce2mkhI iYJrukE5nk2ilV/QwFB0aei0qA== 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) 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 Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com 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> Subject: [kernel-hardening] [PATCH v1 05/27] x86: relocate_kernel - Adapt assembly for PIE support 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