From patchwork Wed Oct 11 20:30:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000581 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 3A3666037F for ; Wed, 11 Oct 2017 20:33:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EBBB28B37 for ; Wed, 11 Oct 2017 20:33:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22A2C28B6A; Wed, 11 Oct 2017 20:33:44 +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 BA04628B37 for ; Wed, 11 Oct 2017 20:33:43 +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 1e2New-0000Kx-7J; Wed, 11 Oct 2017 20:31:18 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Nev-0000Gk-B3 for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:17 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id B0/84-31244-59F7ED95; Wed, 11 Oct 2017 20:31:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRWlGSWpSXmKPExsVyMfTAVt3J9fc iDVZ9ZLf4vmUykwOjx+EPV1gCGKNYM/OS8isSWDP6/95lKlgoXPFx02qWBsYH/F2MXBxCAjMY Je4uXc8C4rAIvGKRmNzylh3EkRDoZ5W4v3YxkMMJ5GRJzHj8jRnCTpOYsfwGE4RdJtG7qBOsR khASWLrhqXMEGP/MUosW7OQFSTBJqAlsadhPhNIQkTghLDEpg+/GUEcZoEzTBLH+06CVQkLuE l8evAI6BAOoENUJS5/SAIJ8wpYSBw4/A5qs4XEsWOHWUBsTgFLie8bDzFDbLaQWDnrPOsERsE FjAyrGNWLU4vKUot0LfSSijLTM0pyEzNzdA0NzPRyU4uLE9NTcxKTivWS83M3MQKDjgEIdjDO vux/iFGSg0lJlPdhzL1IIb6k/JTKjMTijPii0pzU4kOMMhwcShK80+uAcoJFqempFWmZOcDwh 0lLcPAoifA2gaR5iwsSc4sz0yFSpxgtOS7cufSHiePAnltAsuPm3T9MQix5+XmpUuK8pSANAi ANGaV5cONgMXqJUVZKmJcR6EAhnoLUotzMElT5V4ziHIxKwryHQabwZOaVwG19BXQQE9BBoml 3QA4qSURISTUwxh7TTftxvGoGc14od8C7Cqmuu7eW3em6YLIySNPxoI2XSoeVTSfHoZvmdnFy uQk7SqceF1iwqU7RL3TplM8FXkl/ry3/+zOlpL2h2lrq64m/kToKjgb/5vOvUnMXO6gpOcvCV iRbovyL5XnHy0o7OJPUkt7l5DhNuTwntH3G+hNlGV66KeeUWIozEg21mIuKEwFAqfbXzAIAAA == X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1507753873!100963361!1 X-Originating-IP: [209.85.192.181] 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 63186 invoked from network); 11 Oct 2017 20:31:14 -0000 Received: from mail-pf0-f181.google.com (HELO mail-pf0-f181.google.com) (209.85.192.181) by server-8.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:14 -0000 Received: by mail-pf0-f181.google.com with SMTP id d28so1958624pfe.2 for ; Wed, 11 Oct 2017 13:31:14 -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=MKzV0u1JGioKbedjKbjUST0iFVCFH6bpx3CCcTcw5V8=; b=lJA9KDUa0GeTuq0dpV4RpBRHxAn4BACOncS3/2qRg5XtSSH9ZJacRxPlgYXJml/0/3 dxuzuJgSC7r0Ga4eKkCNompKLUX+QTg0AItMe0iFu34SYWyJ8kzoz8L4a8XlvfvYs5hf 6vr4rNG8dtwTfzyV57hBfCEro+GUJLqJ1hvzaQJymLFam1N9QcCryyWmGI5LPL+HIHgA 1b8DsS3xg3nin9Kda5bV5XkqN1tgtwhcSQThlZVGyKFFyzHWeG6D5Js7FIvMfLJXWnkp 6sgIDk91PTc5G/lkfSxtXkyWkX/zrY2dyIWVt/n8UiPTGmvBfaYv9COjmlc0yOx4a5/4 9vlw== 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=MKzV0u1JGioKbedjKbjUST0iFVCFH6bpx3CCcTcw5V8=; b=mykcFLaJB4IvDSIBu19pUwP7X4WAnLJmwxJXajqlCbTp2slrAxjwBi3YcNbYHJBmWs 7frsBBgIENrzPchqqG7S1lH2CvS9zR+mG8VTkIGt7zXif7eVDSQ79z6cnnQ9GPeuQ9Kv E6D03hmRn6D4xyHqMMmBV0b7LLuQh5RipV3cazlnqVaCp2zF3nktelZ3x3EmtxILwKDO ZvmzF+FgPDtBwSexoSCS8Tt3wNFrA+YkLwonmZqZQXc6fb9HMRSDaW+j1r4Pn5Pp8ESm JYNHYnjUokb0Lc5jMOlkWeU77pQXSd5ZFRMUOxfs4ErzD4SjjozP8GTyJLVyYVpO+GdR 9SYg== X-Gm-Message-State: AMCzsaXuqkzsKefxO27xapHcKcd9+dM8dGmCWuugGbrbT4OomGmf1MjT 6IaNM24G5Wi2XmhfwgLCxr19Jw== X-Google-Smtp-Source: AOwi7QCnV4Tj3fzJds7Bxl6plTj8SVABj8ddqzjpQdI0+0lD0SPyeQ5S2Cr/bTmYxlqp3sBbTuvcUw== X-Received: by 10.98.21.86 with SMTP id 83mr191740pfv.290.1507753873091; Wed, 11 Oct 2017 13:31:13 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:12 -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:06 -0700 Message-Id: <20171011203027.11248-7-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 06/27] x86/entry/64: 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/entry/entry_64.S | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 49167258d587..15bd5530d2ae 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -194,12 +194,15 @@ entry_SYSCALL_64_fastpath: ja 1f /* return -ENOSYS (already in pt_regs->ax) */ movq %r10, %rcx + /* Ensures the call is position independent */ + leaq sys_call_table(%rip), %r11 + /* * This call instruction is handled specially in stub_ptregs_64. * It might end up jumping to the slow path. If it jumps, RAX * and all argument registers are clobbered. */ - call *sys_call_table(, %rax, 8) + call *(%r11, %rax, 8) .Lentry_SYSCALL_64_after_fastpath_call: movq %rax, RAX(%rsp) @@ -334,7 +337,8 @@ ENTRY(stub_ptregs_64) * RAX stores a pointer to the C function implementing the syscall. * IRQs are on. */ - cmpq $.Lentry_SYSCALL_64_after_fastpath_call, (%rsp) + leaq .Lentry_SYSCALL_64_after_fastpath_call(%rip), %r11 + cmpq %r11, (%rsp) jne 1f /* @@ -1172,7 +1176,8 @@ ENTRY(error_entry) movl %ecx, %eax /* zero extend */ cmpq %rax, RIP+8(%rsp) je .Lbstep_iret - cmpq $.Lgs_change, RIP+8(%rsp) + leaq .Lgs_change(%rip), %rcx + cmpq %rcx, RIP+8(%rsp) jne .Lerror_entry_done /* @@ -1383,10 +1388,10 @@ ENTRY(nmi) * resume the outer NMI. */ - movq $repeat_nmi, %rdx + leaq repeat_nmi(%rip), %rdx cmpq 8(%rsp), %rdx ja 1f - movq $end_repeat_nmi, %rdx + leaq end_repeat_nmi(%rip), %rdx cmpq 8(%rsp), %rdx ja nested_nmi_out 1: @@ -1440,7 +1445,8 @@ nested_nmi: pushq %rdx pushfq pushq $__KERNEL_CS - pushq $repeat_nmi + leaq repeat_nmi(%rip), %rdx + pushq %rdx /* Put stack back */ addq $(6*8), %rsp @@ -1479,7 +1485,9 @@ first_nmi: addq $8, (%rsp) /* Fix up RSP */ pushfq /* RFLAGS */ pushq $__KERNEL_CS /* CS */ - pushq $1f /* RIP */ + pushq %rax /* Support Position Independent Code */ + leaq 1f(%rip), %rax /* RIP */ + xchgq %rax, (%rsp) /* Restore RAX, put 1f */ INTERRUPT_RETURN /* continues at repeat_nmi below */ UNWIND_HINT_IRET_REGS 1: