From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07AC0C432C0 for ; Tue, 3 Dec 2019 23:04:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD6202064B for ; Tue, 3 Dec 2019 23:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414261; bh=NtarbQ3mMcuCpzgGK4ZA5qZrc+60HUEkX7IGiYZOgdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UppD9p+Im0/On9lO2YNis5Iuk2/mI7eBC/cKI2Em8BgUdu3gA1K5B2vv+y0UXZtro 6xvuTjKyfUKzEutuohFa/8RqLEgepgc4UXhMzhkaF5gUuCDblBbPqQAzvdTO26Pa1s LKtL3bIBBIP7FCXAPQmzfGvSnUv4724sAeGy0yfY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730329AbfLCXEU (ORCPT ); Tue, 3 Dec 2019 18:04:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:44356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727120AbfLCWvx (ORCPT ); Tue, 3 Dec 2019 17:51:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1FF4F2084B; Tue, 3 Dec 2019 22:51:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413512; bh=NtarbQ3mMcuCpzgGK4ZA5qZrc+60HUEkX7IGiYZOgdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T5i2NpWvlODP+VLuLtfiVjz1SY8T0qKES/YL4ske8yX+24SY0nPePaPaxS9yqBj8Z Z+97UhLg3NQwQnkEGIp6qM2+PyE6jCdn1le+iWSDY6Dn7YqjTOzouub98b92Mqqrts 49NNenJG+NaR0066zDpYqgLPsvArI9PIMb2sC3jk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrea Righi , Masami Hiramatsu , Andy Lutomirski , Anil S Keshavamurthy , Borislav Petkov , "David S. Miller" , Linus Torvalds , "Naveen N. Rao" , Peter Zijlstra , Thomas Gleixner , Yonghong Song , Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 129/321] kprobes/x86: Show x86-64 specific blacklisted symbols correctly Date: Tue, 3 Dec 2019 23:33:15 +0100 Message-Id: <20191203223433.864161315@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu [ Upstream commit fe6e65615415987629a2dda583b4495677d8c388 ] Show x86-64 specific blacklisted symbols in debugfs. Since x86-64 prohibits probing on symbols which are in entry text, those should be shown. Tested-by: Andrea Righi Signed-off-by: Masami Hiramatsu Cc: Andy Lutomirski Cc: Anil S Keshavamurthy Cc: Borislav Petkov Cc: David S. Miller Cc: Linus Torvalds Cc: Naveen N. Rao Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Yonghong Song Link: http://lkml.kernel.org/r/154503488425.26176.17136784384033608516.stgit@devbox Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/kernel/kprobes/core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index e83a057564d1b..173e915e11d54 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -1140,6 +1140,12 @@ bool arch_within_kprobe_blacklist(unsigned long addr) is_in_entry_trampoline_section; } +int __init arch_populate_kprobe_blacklist(void) +{ + return kprobe_add_area_blacklist((unsigned long)__entry_text_start, + (unsigned long)__entry_text_end); +} + int __init arch_init_kprobes(void) { return 0; -- 2.20.1