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: 9254575 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 BFDD2608A2 for ; Mon, 1 Aug 2016 17:10:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB48A283A6 for ; Mon, 1 Aug 2016 17:10:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A537284B0; Mon, 1 Aug 2016 17:10:00 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EFAE2843C for ; Mon, 1 Aug 2016 17:10:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754420AbcHARJA (ORCPT ); Mon, 1 Aug 2016 13:09:00 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34448 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754249AbcHARIm (ORCPT ); Mon, 1 Aug 2016 13:08:42 -0400 Received: by mail-pa0-f47.google.com with SMTP id fi15so54652117pac.1 for ; Mon, 01 Aug 2016 10:08:21 -0700 (PDT) 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=MR0g9N9ittvphzPp/UAmim2Nrzf+9BKoFVu0AXmgU/iroKfCWEc+rie4gvUJZBWr4y MzLN/VgFXOGypA+ntbJ3ROiSyLwTqkw0YPlPb4Imy56tJDJNYJx/tZb35awYIbfKrX1z 8Q1eVcmXqXiGDX9tjXM1IcJtwrvL+ZlS9hMyu3z/X1v3CXRr5XW8tXt9/pbh/WO4TJKi dCEweRtl+eoc/P2fzLuaI/8bpTXoezWMiLyDtsB18dLD5LdY87rbc+cWbXI6QKpz9i9d T95nRwv/qYPmz/q67b/5R91wDeB1N69SRaQSjxvburoMR9TgW0jSglJ4fadqaY5hHdxD 4vJQ== X-Gm-Message-State: AEkoousbLaKHjTNOs3Wov+Bk+VrJwrBjp9SQAnL/iQc6OkPKLfOMX0T0AVrq/tYLLQcDHXXI X-Received: by 10.66.219.105 with SMTP id pn9mr97269476pac.25.1470071300881; Mon, 01 Aug 2016 10:08:20 -0700 (PDT) Received: from skynet.sea.corp.google.com ([100.119.232.34]) by smtp.gmail.com with ESMTPSA id i69sm47087390pfk.30.2016.08.01.10.08.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); 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 Subject: [PATCH v1 2/2] x86/power/64: Fix __PAGE_OFFSET usage on restore 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> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 */