From patchwork Wed Oct 4 21:19:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985565 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 E5C0260586 for ; Wed, 4 Oct 2017 21:23:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D66F628C2C for ; Wed, 4 Oct 2017 21:23:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA57528C2F; Wed, 4 Oct 2017 21:23:33 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, 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 6A94A28C2C for ; Wed, 4 Oct 2017 21:23:33 +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 1dzr6E-0002kc-Sg; Wed, 04 Oct 2017 21:21:02 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr6D-0002Ve-2m for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 21:21:01 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id 90/FD-03435-CB055D95; Wed, 04 Oct 2017 21:21:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsXiVRusrbsr4Gq kwcR+VYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWNHUyNjwVzhiu9TbrM1MN7h72Lk4hASmMEo sbfvFTOIwyLwikXi3qeHTF2MnBwSAv2sEvfaCiHsLIkbSw4yQ9hpEp8bDrNC2FUSt65fYwGxh QSUJLZuWMoMYf9llFizOAjEZhPQktjTMJ8JZIGIwCwRiVuve9hAHGaBM0wSx/tOgk0SFnCRuP N+BthmFgFVibc3tzOC2LwCFhKN+9cyQmwzkXh45BpYPaeApcSRE2+gtllItJ65zzSBUXABI8M qRo3i1KKy1CJdYyO9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAoGMAgh2Mp9cF HmKU5GBSEuXd5Hs1UogvKT+lMiOxOCO+qDQntfgQowwHh5IE70N/oJxgUWp6akVaZg4w/GHSE hw8SiK8k0HSvMUFibnFmekQqVOMxhz79tz6w8TRcfPuHyYhlrz8vFQpcd7NIKUCIKUZpXlwg2 BxeYlRVkqYlxHoNCGegtSi3MwSVPlXjOIcjErCvA9ApvBk5pXA7XsFdAoT0Clzmq6AnFKSiJC SamBkCz9gKGpX++eEz834aa81lp/f2OsZwTs394rUf03RjAJP7fNvGDZEetZV8r/lPMeumPti ho+5Tey2FM0HjfnyNZk+5YlHypLse/zaHnwt0OJ5t5WzqsspYuqvR1GlxqfuiVn+nFRmHnB1k eiEGYrLt/bd6Fqcp3zn4s8T1jkFW6LdQlI2aCqxFGckGmoxFxUnAgDeUPLaxgIAAA== X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1507152057!76276711!1 X-Originating-IP: [74.125.83.43] 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 3763 invoked from network); 4 Oct 2017 21:20:58 -0000 Received: from mail-pg0-f43.google.com (HELO mail-pg0-f43.google.com) (74.125.83.43) by server-8.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 21:20:58 -0000 Received: by mail-pg0-f43.google.com with SMTP id i195so7165370pgd.9 for ; Wed, 04 Oct 2017 14:20:58 -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=27RxEzHq6V/uBWwmYm63m3cwdhsLt8zrkpY+k9XYfO8=; b=ILfAelDUtH+aGp0tvZWo+bbHBg3inL3kMyTg125DiPxAlpFUMxhfoic7IqnPMedYyQ O0JcAn9Mg5Fp90xFbALMO0LXEWaQeOY5nGjNYv+PSIBSu9xsixpSiXNUQBIzMT6wqHpY SDl+b4KXoGM+UAU7/Gtqa2Vm9sKcj1BErnBGfn6cqH48oRiHtvhwACSk2r2V8pXvvukk ok4U5OURGwViI04nDZBufSaFuQLMPC/ZD21+vBKC4ISvlWQ/uOLok0auTXMsKGm3Xdxd TCP5ycDP6lcDQ1SHuYSfJAx99gryAz87wbzQDMEmWOfJSpE+uXeLEaawbwCOn/TJ5jFs L+vQ== 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=27RxEzHq6V/uBWwmYm63m3cwdhsLt8zrkpY+k9XYfO8=; b=E+y2E3GTQdAzAkAtb5/TqriB85t+ZxMauJceRtP2DlyMEd5Jqvglf54M4ZaRGpEoZA K3bk7ydXmDAjRJm0kzrUDddXPcp4fy7aafR0wnnpu6Lg2pmmWgR3qdvngDheH3viLCVx CqAya6aguqdtV6Hmkk+5lmEPjMBEQB4P3aGcuuRO1ygwsqzBjowVVIgwiSg+Qh14Hmne omiVG+frjHx6YR3swP6UpUY0scPAi9yxPAsg3QFoWDDytiK2x45PKY9WgrOqDKdGbWFU cOTp667mwJONVCRfz4kpdxexWGQslgtxsOSONpGmJ7GYh61jZoBIgS6tE8the/9naN8D kiKA== X-Gm-Message-State: AHPjjUhg0qO5HdcLhH8TguHsPrgYsh/SYKxcUXMR2OFKaqjvLNdZNHvG I7+nslhFhuNVn2LfBizxnqBfHQ== X-Google-Smtp-Source: AOwi7QDscLvHF1N0TGpzm4PhCk5GHHyQcKqD/Kg7e2Nswt+mDp90u9j+nOH5Bu7tBtOpTCOluwP2iA== X-Received: by 10.101.88.76 with SMTP id s12mr19774595pgr.159.1507152055766; Wed, 04 Oct 2017 14:20:55 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id s68sm30204019pfd.72.2017.10.04.14.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 14:20:55 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , 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 , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , 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 , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 4 Oct 2017 14:19:42 -0700 Message-Id: <20171004212003.28296-7-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-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] [RFC v3 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: