From patchwork Mon Aug 1 17:08:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9254573 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 303E76048B for ; Mon, 1 Aug 2016 17:09:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C1332839B for ; Mon, 1 Aug 2016 17:09:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10CBC283E0; Mon, 1 Aug 2016 17:09:53 +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 40D592839B for ; Mon, 1 Aug 2016 17:09:52 +0000 (UTC) Received: (qmail 18136 invoked by uid 550); 1 Aug 2016 17:08:33 -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: Reply-To: kernel-hardening@lists.openwall.com Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 18043 invoked from network); 1 Aug 2016 17:08:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L2sEkeTkRzZ+1dB0pbbwdT8Dc+UqGC+E15tpERvghCM=; b=kCmT2OLpFXSYTvz7qe+pbho7b/Gdu/R2B7F6K9HVIUX/K+hF+vfuSuQsC8hNemW0ab DoEx4U/kM/DwZ3VkZFz5PidjLB/KrlupbLrA9BDVVIDwIFDi84K0o0dzRMTnkhmnyKsY mY8GO8bcsnexFY8pagBOt25KlAH3mjsXKZW1MMhG5BYWfMWia8vDReEneQGYY5wPQARi 0+RcaezXXhy/HXKMSFCRGQCYt6MeoZYW9SKZ7AbSLXrlI9OQB8wWt1t+DeOJ2qRayRAV WF4hzwCUYlObhAcT4xzPZXYkArrtCuO2YgpZZ1mj4N/FwuT1cwnbGF38GG1w1cMawO3V fOXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L2sEkeTkRzZ+1dB0pbbwdT8Dc+UqGC+E15tpERvghCM=; b=M+e5Z/lUCU3ZoW8OUCu8WKaz+tkWWu7opjSBJmzNPhcYxifFR7gA9l3v4LFMIL/Jjd V43y0HowVUc7WkjFBzof2uBNoWlK1ZKdD1qtE89pEKmCgTEglujIxISo4ZTafDagfyq6 G4qtFbl/8tLb22zZP8u7KqhHVg7WLyIqE1RjVGQHjAp6EYIQxvsM7jG128sE78g6kF3N tiDkHlvLky2gthsZavD7veBFCX6l+3PSf9rWHcW1SLlvREjqsRaaV8+RwwVramRHaZT7 Kc652mn0D2pB6jk9LdCbAbrOtsTw4pj7+ZFkpsmQRNzRj/JsxR+/ZF0Ebwyjooid3W3D mU3Q== X-Gm-Message-State: AEkooutWnre4Z1zZgnWvxgJWPih383E2Pi4RPgUZ5KH1EmYEn6HummUCPyeJ6s+GMxrOpdMX X-Received: by 10.66.219.105 with SMTP id pn9mr97269476pac.25.1470071300881; Mon, 01 Aug 2016 10:08:20 -0700 (PDT) From: Thomas Garnier To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Kees Cook , Thomas Garnier , Yinghai Lu , "Rafael J . Wysocki" , Pavel Machek Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, kernel-hardening@lists.openwall.com Date: Mon, 1 Aug 2016 10:08:00 -0700 Message-Id: <1470071280-78706-3-git-send-email-thgarnie@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1470071280-78706-1-git-send-email-thgarnie@google.com> References: <1470071280-78706-1-git-send-email-thgarnie@google.com> Subject: [kernel-hardening] [PATCH v1 2/2] x86/power/64: Fix __PAGE_OFFSET usage on restore X-Virus-Scanned: ClamAV using ClamSMTP When KASLR memory randomization is used, __PAGE_OFFSET is a global variable changed during boot. The assembly code was using the variable as an immediate value to calculate the cr3 physical address. The physical address was incorrect resulting to a GP fault. Signed-off-by: Thomas Garnier --- arch/x86/power/hibernate_asm_64.S | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index 8eee0e9..8db4905 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -23,6 +23,16 @@ #include #include +/* + * A global variable holds the page_offset when KASLR memory randomization + * is enabled. + */ +#ifdef CONFIG_RANDOMIZE_MEMORY +#define __PAGE_OFFSET_REF __PAGE_OFFSET +#else +#define __PAGE_OFFSET_REF $__PAGE_OFFSET +#endif + ENTRY(swsusp_arch_suspend) movq $saved_context, %rax movq %rsp, pt_regs_sp(%rax) @@ -72,7 +82,7 @@ ENTRY(restore_image) /* code below has been relocated to a safe page */ ENTRY(core_restore_code) /* switch to temporary page tables */ - movq $__PAGE_OFFSET, %rcx + movq __PAGE_OFFSET_REF, %rcx subq %rcx, %rax movq %rax, %cr3 /* flush TLB */