From patchwork Fri Feb 28 00:00:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 11411165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5706F14BC for ; Fri, 28 Feb 2020 00:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 366B2246A6 for ; Fri, 28 Feb 2020 00:01:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ffRKFmzs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729930AbgB1ABh (ORCPT ); Thu, 27 Feb 2020 19:01:37 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:34120 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730279AbgB1AB0 (ORCPT ); Thu, 27 Feb 2020 19:01:26 -0500 Received: by mail-pl1-f195.google.com with SMTP id j7so479942plt.1 for ; Thu, 27 Feb 2020 16:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kBSUTQnCJbQV5pLuilITF26DLiWa2/2BRxaonElBTNQ=; b=ffRKFmzsputibNvCgTe4Pi3ww1xoPkHdMAQDjclUSxqmZY4+B8q2nf8RNjriw9Jun8 QhjORrkShnXbbpqxKBG/5Su6vB1b54AxLYFiIWsapbzv3qhMKXOF8fcrqkG/eiTa+yHW WFQkVpmaUq0W/I2eBjsIlKnDUM+QUKxZzz2Ck= 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:mime-version:content-transfer-encoding; bh=kBSUTQnCJbQV5pLuilITF26DLiWa2/2BRxaonElBTNQ=; b=pTxtcI1ZyoTUzquKBOnZV/6vRgSy79jMr4MgFanu1DVSqiOPgZZNSyntC2ZhvQK3oj Nw++9nuX5mdtRlcGMnOUdfwsAd9Ham+Jrb55uiheUylaxTozb879VkKG35WJUT2SVbDv v9g6+wwcBCMBBCk5xa0k7HoiRpNAwXIITQISWFwP5qFizcS2/PeeCPIzwJdDv5VLwLoD Y8oGNLjiHSM4luy0hscHshI5oenaXegboLES9Nl40RBDfj1j8XlQBLbtyQmqL6QTR+PP CYd7EWxLYSV1HDmxO0qB6J89oclDsHVf5pABqFYmGn6j65purv211uTbzLz1KT/ICTNR NgDQ== X-Gm-Message-State: APjAAAW5rUTsFgFzDVSmDsLhTGr4LcSzD2R6XUO8JXMomi4Qj9cgAS2T 7XW582kc7uqPRRq9iIJ3VqRB3A== X-Google-Smtp-Source: APXvYqzDwLydiJZoarH5wzoZjhL6Dn3ngsWTMAguCr0uuaAVQX0qWk1h8b0wS+NGFKCGYWdFG0VCCg== X-Received: by 2002:a17:90a:da01:: with SMTP id e1mr1626609pjv.100.1582848085161; Thu, 27 Feb 2020 16:01:25 -0800 (PST) Received: from thgarnie.kir.corp.google.com ([2620:0:1008:1100:6e62:16fa:a60c:1d24]) by smtp.gmail.com with ESMTPSA id c18sm7314476pgw.17.2020.02.27.16.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 16:01:24 -0800 (PST) From: Thomas Garnier To: kernel-hardening@lists.openwall.com Cc: kristen@linux.intel.com, keescook@chromium.org, Thomas Garnier , Pavel Machek , "Rafael J . Wysocki" , "Rafael J. Wysocki" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 09/11] x86/power/64: Adapt assembly for PIE support Date: Thu, 27 Feb 2020 16:00:54 -0800 Message-Id: <20200228000105.165012-10-thgarnie@chromium.org> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog In-Reply-To: <20200228000105.165012-1-thgarnie@chromium.org> References: <20200228000105.165012-1-thgarnie@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Signed-off-by: Thomas Garnier Acked-by: Pavel Machek Acked-by: Rafael J. Wysocki Reviewed-by: Kees Cook --- 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 7918b8415f13..977b8ae85045 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -23,7 +23,7 @@ #include SYM_FUNC_START(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) @@ -116,7 +116,7 @@ SYM_FUNC_START(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