From patchwork Wed Oct 11 20:30:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000591 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 37ED26037F for ; Wed, 11 Oct 2017 20:33:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C8CF28B37 for ; Wed, 11 Oct 2017 20:33:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20A9728B6A; Wed, 11 Oct 2017 20:33:54 +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 5820428B37 for ; Wed, 11 Oct 2017 20:33:53 +0000 (UTC) Received: (qmail 15415 invoked by uid 550); 11 Oct 2017 20:31:38 -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 14276 invoked from network); 11 Oct 2017 20:31:33 -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=Bo3aNDBgnk04z3nV6e5Ky0HEgkmxnF72cRiokGUfGBI=; b=WDGwex2r866nw6HBND8UFE28IQ4wtfBfoR7QnC0Z2xeSHJAZvkzR9DXiYycx4JcPgk h8cdpeDSajRHQBjAtaUQRXBifVN5HbJJQrTA44ygztsPZMhHSBFbVWYRV8vw8Qo8CBvP PQZFJnM0PHuvmmExL+MhHZh/PbVh1qQDuixZJk4i9TxbgoIHsPMtZHbvkr9o3oRjbPFY K8h/lrAY3YnyZTkZInofL1pmCXNGd/y6/SEvzChOC5QVSPL+CwqWgoPBAR9fZ9tBZV4e uqsqqY9e+y1A7n8zf8+YFYwdzfiga/k2k62d8i88aWfzb+YdakNu3isKulUz86g+oBaK zo1g== 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=Bo3aNDBgnk04z3nV6e5Ky0HEgkmxnF72cRiokGUfGBI=; b=LJWxjjPGJuYtg08R9Ji6jOSocxaYNZ80U5u9ykQHJpzT/Ubtqcgr5esv8vZtKkjSt/ bsvg0JX0lFmmKLe94dyx4VoGcldoiQrAFIFOkIxO+ZUOwJFJ1niDZJj8GqUOg/ypEKWe G5q/XPGuJQvLBYE+5KBDCH7Ck1801VpMvoDxYFKk1GI5gorrUIOgkkSHXVMpE1RP89g/ hVEg18VcgvbG6ljpPGAPjf5OCMTyuiLYZwP+jsMY98giNniSTlzI6NlO4d6pr6sTytX6 7ak8lSgRFmhXIgbMSv+x/Y+9yoljE1i++tHSbNnEN92HhYcpmWen0RvXtXZ1YLXPIBGb 7VYA== X-Gm-Message-State: AMCzsaUs0S3ujiBO0Ax+x3ch6E4WVT4PFZzf5IiclCQ8saYoZIIGyZVX wzZUTu85muEPEG2OecOvKkt4tg== X-Google-Smtp-Source: AOwi7QDVCIU64We+UPWOOvxyzy2EOPN/YrPANjeh3uUrQm47bu1QZFtp3eC0YUVmdZeV000IFdwirg== X-Received: by 10.159.234.10 with SMTP id be10mr184280plb.386.1507753881073; Wed, 11 Oct 2017 13:31:21 -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:11 -0700 Message-Id: <20171011203027.11248-12-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 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