Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp24902ima; Thu, 31 Jan 2019 11:47:20 -0800 (PST) X-Google-Smtp-Source: AHgI3Iax/RgbTJr9QwWRa5h3SGBfWtaNOZo0N55jZa95DPQ6Hi8W56wqI9F22/qYy9JdY2bNAKwc X-Received: by 2002:a63:9e19:: with SMTP id s25mr11596111pgd.203.1548964039910; Thu, 31 Jan 2019 11:47:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548964039; cv=none; d=google.com; s=arc-20160816; b=m/BtjwOdYrSedHVdoA+YXbRVDUa2LKDeQwj03HwqDuZUDvUI1bZySOKXLLmZjvUrgE wewyxr+Wy/FHDvw6Axc0HnWJ6Fx4h2C8RBbd7gql98jWc5WeG3R9/RYOANXl9WlpfjOG vElJmTzCEynNKrBU2Yq4HkWFhYOvrDTVwR/VEL+7GvkYiffXNOUtEmSN+hI3NIdBu5s6 Y/RMrqetGoUZbABGZayQwn8kSJOWhK4HZ19r1GJFCenNp9aGjyHoyi0rb4kAdJ6ODlWF XPkk+wcMNOjyDXql2Mzgycgz3nsDYcFBCYnLBLB3HS//4s3ahrubZ0EEsb6+CETMZ9ec BhSg== 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=3QqM92PuroQMRE5kfXgAFoy35KvoRU+1smYlTm3vmiw=; b=Bh9e67O1FL74Nc+0Gb658LFFRhZRHqSOIejZVdxmrlouXaomN/4kgoS1ACMoXyAW+B gXbdPNsgtEjJCInCfhaNHA33oPGobdGeTnJ6JceYXBW4fHHM5EkiIQ49TMtIaCoFRFVQ ZOle9o3Y0AsFUTzvARpaVSt6xeAuqOvJ1S+q5LEmafQYiwoj9mLvUopIcVdfm1IevB6q iKHsG34TwQojYuc8QmSp0JZgNbmn4jZqOl+epkqncAz2u2SwW3nNyHuRzecGdFoR8kcU sLQImq6Fs8PReE8TETdt4IcOeeRycGdc0kxQ+j+9VGWIJk0tYUIu4JFmo5Ne41KorlGB HJxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=mvJ8b78v; 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 a1si5568399pld.249.2019.01.31.11.47.04; Thu, 31 Jan 2019 11:47:19 -0800 (PST) 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=mvJ8b78v; 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 S1728493AbfAaTbK (ORCPT + 99 others); Thu, 31 Jan 2019 14:31:10 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39317 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729101AbfAaT2R (ORCPT ); Thu, 31 Jan 2019 14:28:17 -0500 Received: by mail-pg1-f193.google.com with SMTP id r11so1777977pgp.6 for ; Thu, 31 Jan 2019 11:28:17 -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=3QqM92PuroQMRE5kfXgAFoy35KvoRU+1smYlTm3vmiw=; b=mvJ8b78vHV25r93JNQW5CF+SxfDiDnz/t5sOvODw/zPSqpI5rsWDibc4bweSjX4usY Zuj7fShtiLzRkVs6tfF7SibkS+yAfqRzJkZYWjWErRqGnfNWInjw8/wTtGRqC0elnwIm TjONK91xHi6iO0G613VXaLvcVDSdLI1ZqdXMs= 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=3QqM92PuroQMRE5kfXgAFoy35KvoRU+1smYlTm3vmiw=; b=LzDkt08XH3uKWhe9QL5VrE5Niifb7X08N0Fbemrv900WJKWiB/z56X7Gn/NvwdfF9L Z8AzrezhFnheTtpiwdq4fh3ibTX7+1fZ8Q/dX/DlihLc+t6Z0wQimt3gZXqPHP0/kfWS PUlD8iXsxRCWmriPvgnsVUAJ4WbSsYCDSfLJDcjdw4Reqrt3RZBND1s4uyAbAyZrLEyf 1seJ8t01dWlpRMQa7+q1Jypluv6TtQxQR8njt9xevdEQAySs25ta2GVuq5rUsPjgj/Ve sHI8U5FVYKZVzYxSY0Nd0Dk3VIZ6sbBznH3DeWZ8D9fKIyYarmy5pi8PnZdXy9pCXNVv aJWQ== X-Gm-Message-State: AJcUukdYeUoC1yUy96wYKbPEKpW0lOhqLYF+d1rxy5RSb4gdVPbkWX3K 87CGCcLm9HJuI5GXVfiPQwW2yA== X-Received: by 2002:a63:d40a:: with SMTP id a10mr32175673pgh.394.1548962896699; Thu, 31 Jan 2019 11:28:16 -0800 (PST) Received: from skynet.sea.corp.google.com ([2620:15c:17:4:29de:3bb1:1270:e679]) by smtp.gmail.com with ESMTPSA id s130sm11164399pgc.60.2019.01.31.11.28.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 11:28:16 -0800 (PST) From: Thomas Garnier To: kernel-hardening@lists.openwall.com Cc: kristen@linux.intel.com, Thomas Garnier , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, "Peter Zijlstra (Intel)" , Ard Biesheuvel , Thomas Garnier , Nadav Amit , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v6 02/27] x86: Use symbol name in jump table for PIE support Date: Thu, 31 Jan 2019 11:24:09 -0800 Message-Id: <20190131192533.34130-3-thgarnie@chromium.org> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog In-Reply-To: <20190131192533.34130-1-thgarnie@chromium.org> References: <20190131192533.34130-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 Replace the %c constraint with %P. The %c is incompatible with PIE because it implies an immediate value whereas %P reference a symbol. Change the _ASM_PTR reference to .long for expected relocation size and add a long padding to ensure entry alignment. Position Independent Executable (PIE) support will allow to extend the KASLR randomization range below 0xffffffff80000000. Signed-off-by: Thomas Garnier --- arch/x86/include/asm/jump_label.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index 65191ce8e1cf..e47fad8ee632 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -25,9 +25,9 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" ".long 1b - ., %l[l_yes] - . \n\t" - _ASM_PTR "%c0 + %c1 - .\n\t" + _ASM_PTR "%P0 - .\n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: @@ -42,9 +42,9 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" ".long 1b - ., %l[l_yes] - . \n\t" - _ASM_PTR "%c0 + %c1 - .\n\t" + _ASM_PTR "%P0 - .\n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: -- 2.20.1.495.gaa96b0ce6b-goog