From patchwork Wed Oct 4 21:19:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985589 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 3E5EC60586 for ; Wed, 4 Oct 2017 21:23:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E5B428C2C for ; Wed, 4 Oct 2017 21:23:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21E4928C2F; Wed, 4 Oct 2017 21:23:55 +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 4F28C28C2C for ; Wed, 4 Oct 2017 21:23:54 +0000 (UTC) Received: (qmail 15824 invoked by uid 550); 4 Oct 2017 21:21:24 -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 15643 invoked from network); 4 Oct 2017 21:21:17 -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=KBZP7LTWcU8ejWHR5l3w5i+YVxGEs1JlrpLsHdxiGuM=; b=kJ6t5D+YogragdLpPtigGhYGpA1izYO3Fw09y8f76Jfu2o8uPhiXIAJ4rMv+f/ifHU 0JoCa8xllMGUsR7O4zY3B2z6nr7Th9j0lwUPcRhSCfFVR8cW5UGYTbRxN9knBuxJWYhc YtZvF1Eeu2EJ0ywYTKCH0QcJhFGT1jmoJ+OYzEwjHGfxIU0d4aiHdcfnUYwvq+NQXX57 31nqRCp+eunr2jGU2f9qHSAF8FV5biQS8JLQWlKj6q17cExfXR3TMu8d5ckPtcv4VT97 +ss9GsBcNeOt19wtTitb2fRWGWXCqc+/3OAD/ZPG/OIoDRmEmuuQb8dpkplaW+udSykp gB3Q== 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=KBZP7LTWcU8ejWHR5l3w5i+YVxGEs1JlrpLsHdxiGuM=; b=hrePauESVCwwaEWb99WlQ2oRjZ3p4NLKr3xs1p11ywb9vSOb8pJw6j4dk/pIz/3FMf LPlZHuidLXtpKgnQ46ZucI/RW3e+3cEJDsYqMkDSG46o+ZkMSMCpA69NgssFg/sfCjCH OyYTJrjDbNAsJAQKTaTpSg4FHX5cbXRzHEu0aqsMr7GNmmjie0oUuCnmtkj3oMmEypRp CcMTVvcQW1COX+zFjn7cgE00BbvUN9/KW9i9w++tBb3hcTNpoE+YrG1+oHAvaLr4lHdY H6X1wTmrQ9Ay7dYvChBjESRWZDCSLGwDO0zEw64cq0zE8+t6t7oDskU0rjEOFcNBRlv7 oNmg== X-Gm-Message-State: AHPjjUhXmf2Ctnv7aXUIRdtPmhxF2EOBnH08l1rBDo/1tdY9cQrxbqpS KXvK9wrxlhz/beJ89oHBmKZfJA== X-Google-Smtp-Source: AOwi7QAa81pekSpsub2Y4HSFpcusSa6p/CcIEbX5vl0ziottP7rH534PjA2XzBUYa0hWefQtYNDmBw== X-Received: by 10.159.198.73 with SMTP id y9mr21292843plt.370.1507152065125; Wed, 04 Oct 2017 14:21:05 -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 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, 4 Oct 2017 14:19:47 -0700 Message-Id: <20171004212003.28296-12-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> Subject: [kernel-hardening] [RFC v3 11/27] x86/power/64: 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/power/hibernate_asm_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index ce8da3a0412c..6fdd7bbc3c33 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -24,7 +24,7 @@ #include ENTRY(swsusp_arch_suspend) - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) movq %rsi, pt_regs_si(%rax) @@ -115,7 +115,7 @@ ENTRY(restore_registers) movq %rax, %cr4; # turn PGE back on /* We don't restore %rax, it must be 0 anyway */ - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq pt_regs_sp(%rax), %rsp movq pt_regs_bp(%rax), %rbp movq pt_regs_si(%rax), %rsi