From patchwork Wed Oct 4 21:19:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985499 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 0136560586 for ; Wed, 4 Oct 2017 21:22:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5EDA28450 for ; Wed, 4 Oct 2017 21:22:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D97B828C2E; Wed, 4 Oct 2017 21:22:21 +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 C88F528450 for ; Wed, 4 Oct 2017 21:22:20 +0000 (UTC) Received: (qmail 14305 invoked by uid 550); 4 Oct 2017 21:21:05 -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: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 14132 invoked from network); 4 Oct 2017 21:21:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Auij3VDdZJMf47AluGx82Dq+ZwsuQ0eF36Egb27uFO0=; b=CtybM7YtqDrqc2w+2bc+NAUF/AjMnUf+c7EQsx1NRTdsTzuZtmP5uRhVXIS5klouMC OJNBV5Rkc662pqiwKQvZux6h2zUrTxO1QrMGqiRykNtS79QknQVW0UDAdFahF+J26U+v zMEqc+WLSGsth/BLbjTSAM1jZBvuMVYMKkE5BTRxCoPk/JRJsZZTWtc3YcM8FhjFHmgv WXjGJFaD/jZveNmqSsO3ybrx7P/Txk/T1UYNV08WGceTY7a6Q72sAluq5Lpu6MsAFEPH +pGRSOWDtNaHYusM3uxZ6RdgPENAtNPlhF+mk0DOeKHbOdoKpeQ/Eb26OKI2mMujXGq5 ekIg== 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; bh=Auij3VDdZJMf47AluGx82Dq+ZwsuQ0eF36Egb27uFO0=; b=Dqz/rb/N7jQMGnMzvzaEqm0P2mQNDjT4h/IEJ/neUl4tlXJktE5xe55nVeCB4LBUB+ 4iUHscpKXZvBU6lFwtd59hsMYBHD8oYFRYsHFMFasLYKyhzXCM06BtovsJCUshbRouai pSj0YxEhiWl2U/JJTOLxirEObAN5DBqct5y0k1EbTgT8i9q8H88jTU6a0HQvjMrKcot1 Ih0sYKw6uzsAVV+FdOwOGAE3U30ceDbWNOdYKCiJauILfp9G+z4JwmdKVpyqIiMrBELV yMohLvNnKcUxNcKcd3zzt7NPZ8egnmHyKE+WynYvKsgyspr2Yev5b/yNS0Jp+hpnKtxI aPxA== X-Gm-Message-State: AMCzsaXE84ZUhWhjWfb/CxzrXevnX2M2kRouJnawEO4ZWAfixntBBFuH ljCBqzdievBhLQXJAhZmUzdvAg== X-Google-Smtp-Source: AOwi7QDzL4h7vNL1gEzTWT+pBGlVgCwclt1XJAaVqN6n+CD48zDaU9f8JB9bGuY39PWHfUzgBtUA6Q== X-Received: by 10.84.248.129 with SMTP id q1mr14739386pll.156.1507152049817; Wed, 04 Oct 2017 14:20:49 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com Date: Wed, 4 Oct 2017 14:19:39 -0700 Message-Id: <20171004212003.28296-4-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Subject: [kernel-hardening] [RFC v3 03/27] x86: Use symbol name in jump table for PIE support X-Virus-Scanned: ClamAV using ClamSMTP Replace the %c constraint with %P. The %c is incompatible with PIE because it implies an immediate value whereas %P reference a symbol. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. 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 adc54c12cbd1..6e558e4524dc 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -36,9 +36,9 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" + _ASM_PTR "1b, %l[l_yes], %P0 \n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: @@ -52,9 +52,9 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool "2:\n\t" ".pushsection __jump_table, \"aw\" \n\t" _ASM_ALIGN "\n\t" - _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" + _ASM_PTR "1b, %l[l_yes], %P0 \n\t" ".popsection \n\t" - : : "i" (key), "i" (branch) : : l_yes); + : : "X" (&((char *)key)[branch]) : : l_yes); return false; l_yes: