Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp7155590ybi; Mon, 8 Jul 2019 15:46:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4+dneYxEY+WgzPY6g8t+MGCJcwPctyPt8gjONtynZ0qzecuh3dsXLgnKuOBQbOhnaN0Ra X-Received: by 2002:a17:902:aa41:: with SMTP id c1mr27542687plr.201.1562625980724; Mon, 08 Jul 2019 15:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562625980; cv=none; d=google.com; s=arc-20160816; b=bAVNZWTJ2cCW0bwpNT7yg0+VilhQjOjSkbb3Hhs2yTK80aa+DVupa2AKXigqlhceh3 x/Fle+Ft/fLS+zgv+Per2WqswkRX1Y4TzwZryQjzN9fBqy+Ehf15i60HJP/A0URg/56Q Cv1stW/+qXu+XqfTc3BeLZQE+iSGx11X/SojehXyCNk5umusEej44FTIyQTzJ6GCXyIQ GMVT0TqPE9m9xARzM04t8ZiiAoATQIrCpPQgH0jo4OU13Pe5iSqJbna1KWDURH+V/mVb TYOqHsEuKOHMfXSk1hpWVruTD6EeTdQlg5HFUOVt9BD82ppOOdB9D7J7PK/BEptngni4 6XaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OoW2qUxF2Y13G8sy4evp2ekSnjnyuxDpMJJ26amqb7M=; b=FNtECbHcrOncka5IYjE2EW2huj0U+8O7wZ/dGHQ1zc+3xiRl1OW9kGX+AqvYSEp568 YRoVFlRShb/Ze0lpo0E7GlhE6IyFKVqRXNZ8gK8k084GgS1W7+mqR+DxRScJoRbzEntf +2rx7aYkyZTKisl1ClMX8I1ZzhaoOutRQByv6uLeWtKMAbzMN1LxHoBxMI0zTmgQGT6A 3CIG5FQuv3XDh3xxEfcOzj7UlnYY7IgNOKmiT2NQZtigelU8PATadlvagXXqZX7+pZhR 1SAQ1AQgkjc1IHJcwEK8hJOotYm5b/ZyF5sKf3Ol/2vjf3nA/a3wVD93hj4UnuP+Y0uM nV1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BNCUGiWX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p8si15132164pgi.6.2019.07.08.15.46.06; Mon, 08 Jul 2019 15:46:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BNCUGiWX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390825AbfGHRtl (ORCPT + 99 others); Mon, 8 Jul 2019 13:49:41 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38711 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390267AbfGHRtg (ORCPT ); Mon, 8 Jul 2019 13:49:36 -0400 Received: by mail-pg1-f194.google.com with SMTP id z75so8056635pgz.5 for ; Mon, 08 Jul 2019 10:49:35 -0700 (PDT) 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=OoW2qUxF2Y13G8sy4evp2ekSnjnyuxDpMJJ26amqb7M=; b=BNCUGiWXuQ8qN+niQV/uh0ftqGzahTn53WVCXKLQ7j3/UygHUpJNdM1dz3w0hUR9V9 3/HTRrHFz27ciHAqn+eej0H+MN7JSSyl9ZHtRUnlgHj1BwgG3ICdq1xpj6Bn5VYDBAUq mOamx9j7XPuTvZ7+3bO+ZNE5xM1++o+Pceiv4= 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=OoW2qUxF2Y13G8sy4evp2ekSnjnyuxDpMJJ26amqb7M=; b=spuuUJaa+S/vEGtd5ATAhMT7lVldLFmuO3wENCymamXNtbG8cijEaZrvtlcax2is9r 0onf9YAk9mp6M15iH/5vRMHoh1ZxZcWbasjfLvisCT4NZn3lgT9gif7XUVgBEVPvdPwl PYErSQY3hP10S4yYbCTyExV0ExWi9tCAcA/F6jF9+rA4BfqwXAHAH8uLjIuq4rZyp9NO uRujbsOl2RiS1/Dm9J3AcKJz0frPeQi2siGkAvvAQOMZo7B76dn3PNe57fg8t3o5VY/N inNT0A1O+FITSbDM09Ds24cx1YaNPotPZEIwVgOZrV9xpWy++F+6Ybcuvl36omx4nNsp VazA== X-Gm-Message-State: APjAAAWPGslAFKtVtTFv9U9zvu7d0xZ0zv+DJEvPWKxp4ZReLCnNJDkH S44d0a5SCFV2fYHvNoFaO86Riw== X-Received: by 2002:a17:90a:5288:: with SMTP id w8mr27583562pjh.61.1562608175528; Mon, 08 Jul 2019 10:49:35 -0700 (PDT) Received: from skynet.sea.corp.google.com ([2620:0:1008:1100:c4b5:ec23:d87b:d6d3]) by smtp.gmail.com with ESMTPSA id j1sm20151686pfe.101.2019.07.08.10.49.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 10:49:35 -0700 (PDT) From: Thomas Garnier To: kernel-hardening@lists.openwall.com Cc: kristen@linux.intel.com, keescook@chromium.org, Thomas Garnier , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, Andrew Morton , Len Brown , "Peter Zijlstra (Intel)" , Andy Lutomirski , linux-kernel@vger.kernel.org Subject: [PATCH v8 06/11] x86/CPU: Adapt assembly for PIE support Date: Mon, 8 Jul 2019 10:48:59 -0700 Message-Id: <20190708174913.123308-7-thgarnie@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190708174913.123308-1-thgarnie@chromium.org> References: <20190708174913.123308-1-thgarnie@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Use the new _ASM_MOVABS macro instead of the 'mov $symbol, %dst' construct. Position Independent Executable (PIE) support will allow to extend the KASLR randomization range below 0xffffffff80000000. Signed-off-by: Thomas Garnier --- arch/x86/include/asm/processor.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 3eab6ece52b4..3e2154b0e09f 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -713,11 +713,13 @@ static inline void sync_core(void) "pushfq\n\t" "mov %%cs, %0\n\t" "pushq %q0\n\t" - "pushq $1f\n\t" + "movabsq $1f, %q0\n\t" + "pushq %q0\n\t" "iretq\n\t" UNWIND_HINT_RESTORE "1:" - : "=&r" (tmp), ASM_CALL_CONSTRAINT : : "cc", "memory"); + : "=&r" (tmp), ASM_CALL_CONSTRAINT + : : "cc", "memory"); #endif } -- 2.22.0.410.gd8fdbe21b5-goog