From patchwork Wed Oct 11 20:30:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000523 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 8C7C46037F for ; Wed, 11 Oct 2017 20:32:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8151028B37 for ; Wed, 11 Oct 2017 20:32:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 756CC28B69; Wed, 11 Oct 2017 20:32:33 +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 A5F5128B37 for ; Wed, 11 Oct 2017 20:32:32 +0000 (UTC) Received: (qmail 13853 invoked by uid 550); 11 Oct 2017 20:31:22 -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 13645 invoked from network); 11 Oct 2017 20:31:20 -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=obSiuTx7+ekITdw7FDuKzseMNE7feyUkWplM1bHCZmA=; b=rWKR4UQnbqvSRfh5UwGu44ufcGx0/485CGVoUeI5VwIt5nu/M2SYZP/iRkU7sVlDKG lOuse29vsF0OJ4qCbodDugshAkINjtMlScO272GCq/1xUOdxsVy8NpjHmrI01a7Fut9t mVosAgaiuouPYPM8rp9X06QJGwwJGU1MbRkmNKxZ/J5MZRKbBehCYeMzyzpMrCJyFhir //wprMvPXI6zgVll51AtweM23aaYcqY+tkBX35K9K6IYt6UivwcJTJXm0/yxY0SDeluO DmUOFd1lToIBSzVNMCLpSePp/QHMZd+lYCeFL0z6rittjg1CU1in0SJXjPJzkO1hOArJ 9NwA== 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=obSiuTx7+ekITdw7FDuKzseMNE7feyUkWplM1bHCZmA=; b=l7zDolLPNRJAjDFGuHY0Fk5FGYWNmvhHTpzbWEuK3+j54L7NcVIgSh9Vi83uiVdV8b z2DEqW+TO21wVj2bFy1x9t16SUwPjQlvN86EFrkDKMsyB6pdUMNwxhq8ecNJ22LkHeHB en3wBaU8xUIXw30jNVeLJ/pxuGphD0IN/1ewJzUZqTRsPCd9FqR192K+dkDNgzIYdCxR QXGMH42zeuROgCMvyLiNKmm99zcA7QKI630Vr7MBDnR75SaHC9jqKK2gquyS1rXgFZEt zpMY3Bz2TO9kRvPpOzMmuvyQaix+6qov93Qd9TL+2TUZYWd1uHyAF6s6v/yUbNolbEEB v6JQ== X-Gm-Message-State: AMCzsaVlcAO8AY+Uv5eBy03/8DXl7ixsqBpiZFbSkM6l8MD+GK/9ZCxH g08czq6+9oSiyTyqiTMjSn8lPA== X-Google-Smtp-Source: AOwi7QCTZVFJBj1grUVddGs//C028UVgIDmlXFDYogk1SqSkVIWD1P3OjqjZpotUakOS6gta7gcoOw== X-Received: by 10.99.137.72 with SMTP id v69mr194256pgd.130.1507753867861; Wed, 11 Oct 2017 13:31:07 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , 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, 11 Oct 2017 13:30:03 -0700 Message-Id: <20171011203027.11248-4-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-1-thgarnie@google.com> Subject: [kernel-hardening] [PATCH v1 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: