From patchwork Tue Jan 15 06:24:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10764009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5AC36C2 for ; Tue, 15 Jan 2019 06:24:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4B222BABC for ; Tue, 15 Jan 2019 06:24:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8F462BABF; Tue, 15 Jan 2019 06:24:39 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 67DE92BABC for ; Tue, 15 Jan 2019 06:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DiaKGFWla+k91KJJ+CNJAOusha0CwACeXtunORlnmPA=; b=nkKZm1EL/x67Nu wgMFivOVu8itKrKQhkitJ0RA7r5a8AN0Q7Hgkyg9dUF++pvKqYN200A3ECd2A1VFTH1bF1OUww4+3 83DzIz2TJFKGJEXDtD5SsHV0K+gMLR2eBOUbv8AnYL95K+L/su/SNrLZ2ZrZFv95XJMFj1MK/lETH zGsxqGSrt5rEKVgRSIgBsRjtBsgHlx8SwejS09TFuB6yd7lgk6GgyxbcKlv5fsCZTqT8vIdhzMqh0 V8BiN9huY3UJJFfqevbavlHGh7ymXtpd2As/A1DSSkUE0EHiSFGaAoemyi7n/D/Yh4MP+PzAVBYl9 w56kIuwlzhpzuuTIQiyA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjI9M-00059H-7K; Tue, 15 Jan 2019 06:24:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjI9H-00058V-Jx for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2019 06:24:34 +0000 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 20C9A20651; Tue, 15 Jan 2019 06:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547533471; bh=JMPzgJxn71Oh3CSPLMfjWsZVP7P3WH3Nj9DBNFncCNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0d+QhrAA1raIo2uM8j525TaubAY8kIQauQJKDLhiGMRqVv7wWbq6kWjXGfmxsoX9 NjbiDm+VqVFOQBA/Se3Wa+5BmE7KTsDD9dVaH/aQqtk8TKSR5vxfNesLDdvR8F+PSC IxwCzpAMu2a6FILbySzAk35WBJrHPMaoiYx+jvqM= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH v2 1/4] arm64: kprobes: Move extable address check into arch_prepare_kprobe() Date: Tue, 15 Jan 2019 15:24:08 +0900 Message-Id: <154753344814.31541.1870614689774287684.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox> References: <154753341900.31541.8135985235882849464.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190114_222431_783453_FC14C8C1 X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , linux-kernel , James Morse , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, "David A . Long" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move extable address check into arch_prepare_kprobe() from arch_within_kprobe_blacklist(). The blacklist is exposed via debugfs as a list of symbols. The extable entries are smaller, so must be filtered out by arch_prepare_kprobe(). Signed-off-by: Masami Hiramatsu Reviewed-by: James Morse --- Update in v2: - Update commit message. - Add Reviewed-by from James. --- arch/arm64/kernel/probes/kprobes.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index 2a5b338b2542..b2d4b7428ebc 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -102,6 +102,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) if (in_exception_text(probe_addr)) return -EINVAL; + + if (search_exception_tables(probe_addr)) + return -EINVAL; + if (probe_addr >= (unsigned long) __start_rodata && probe_addr <= (unsigned long) __end_rodata) return -EINVAL; @@ -477,8 +481,7 @@ bool arch_within_kprobe_blacklist(unsigned long addr) (addr >= (unsigned long)__entry_text_start && addr < (unsigned long)__entry_text_end) || (addr >= (unsigned long)__idmap_text_start && - addr < (unsigned long)__idmap_text_end) || - !!search_exception_tables(addr)) + addr < (unsigned long)__idmap_text_end)) return true; if (!is_kernel_in_hyp_mode()) { From patchwork Tue Jan 15 06:24:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10764011 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B88816C2 for ; Tue, 15 Jan 2019 06:25:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A84622BABC for ; Tue, 15 Jan 2019 06:25:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 998982BABF; Tue, 15 Jan 2019 06:25:04 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4F09D2BABC for ; Tue, 15 Jan 2019 06:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uZieVgaA2iBPckvBMfWkfEqORtEPnT6lZP+ZmD8I4r8=; b=P71iNmFjU1G43Q S/hrw/R3Y6HuGfg1z/eOKF4QqJuqfqi74A9Iri0rVek4+5LP6qurCFfXs9lvRYv4oZPgLTQsVfEmW s7ZLlbtKV6IxgP//1sPRJAD4ogvnRhJKGt6OoY8HiuU67sXjQQXB1gcGerddi/qqSXFT+FAgYzXbW xTkeZFPaGpa1jPPZDSlV1FFGLvjYEe1GJ3CDQixtnYdapDnTLP8h6Y7Nnt14PjSX5Bb8zHrmImG9w ph0Xag1WPd/snqa96AMDwxUMPbM2JmUPuw/A33zx2UHns/uba8HflXgfd/FuwJoC2cj9rHnF6zwV8 iloYBn3coZ7jq3tkYgqg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjI9n-0005Th-BS; Tue, 15 Jan 2019 06:25:03 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjI9k-0005Rs-6Y for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2019 06:25:01 +0000 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 B2C5020651; Tue, 15 Jan 2019 06:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547533499; bh=0xtxfZtFdIUmaXPj2hBVcHLm0ZupOdVKMg42UdHhv0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xaxRNC5TU7mwE4kCafxai/8OXGNAt1p6TBuFLDs755hYV+NpzHfTp+UCSIkQtbUtg Kxm5h2EQhd2+quCvpWCzOC2csDJY17wbZqs6zRdAluJR0okey87/cbt0nS07aTOKeA HnxMbXMMGKxU8E1Vrj6Q64otx6HiRzFzihk67BWY= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH v2 2/4] arm64: kprobes: Remove unneeded RODATA check Date: Tue, 15 Jan 2019 15:24:36 +0900 Message-Id: <154753347659.31541.11277302003578292109.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox> References: <154753341900.31541.8135985235882849464.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190114_222500_288034_7E0353DE X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , linux-kernel , James Morse , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, "David A . Long" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove unneeded RODATA check from arch_prepare_kprobe(). Since check_kprobe_address_safe() already ensured that the probe address is in kernel text, we don't need to check whether the address in RODATA or not. That must be always false. Signed-off-by: Masami Hiramatsu Reviewed-by: Mark Rutland --- arch/arm64/kernel/probes/kprobes.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index b2d4b7428ebc..1dae500d0a81 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -91,8 +91,6 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs) int __kprobes arch_prepare_kprobe(struct kprobe *p) { unsigned long probe_addr = (unsigned long)p->addr; - extern char __start_rodata[]; - extern char __end_rodata[]; if (probe_addr & 0x3) return -EINVAL; @@ -106,10 +104,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) if (search_exception_tables(probe_addr)) return -EINVAL; - if (probe_addr >= (unsigned long) __start_rodata && - probe_addr <= (unsigned long) __end_rodata) - return -EINVAL; - /* decode instruction */ switch (arm_kprobe_decode_insn(p->addr, &p->ainsn)) { case INSN_REJECTED: /* insn not supported */ From patchwork Tue Jan 15 06:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10764013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6985313BF for ; Tue, 15 Jan 2019 06:25:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5707A2BA4B for ; Tue, 15 Jan 2019 06:25:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AFD42BABF; Tue, 15 Jan 2019 06:25:37 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 04A2A2BA4B for ; Tue, 15 Jan 2019 06:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+wcReuDWDn/2mpbbzmd4P58IVVd67QHcl3VKMr3vkac=; b=Lfu9kY2OOJzbyo 19z9qm04X5hobBmQdXzalDXNY9xTYA8rAQLRCZ8w+nccm3g6DzfxoDndNHe8r0Roxe/IHw4yBLr/m RLr2dzotvCLvSERSg4egoLcR66s0fsuxuj6c0SMcJW9bVe/hWx0uj1TQZC5rj3Zl3GzPQvshxk8E4 DJ5r2v+tUnBj9ydm3CuE/ozjjFkGmaJQHEcXEjrYaYliRU8A1+lrENJ/JI/4W5KPeIUCQj8wjHDRD qJJfDMoiGmfkcP6RjEsvXssoZAZjeaQjzWw8F3iA+suN6Rxb52XbcDRzV+Bf8sMuasmDoECx5Oi9D lsYTThr323usGbnMKEyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjIAG-0006yL-Ek; Tue, 15 Jan 2019 06:25:32 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjIAC-0006xu-RU for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2019 06:25:30 +0000 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 3AC9C20651; Tue, 15 Jan 2019 06:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547533528; bh=QM7XOsAU0i1KQFQo/n6k/OXJ89dL3NSEi3PjGHYFhXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQnVjSJyhe5H/zxDjv/AU43qpcQRkrL87bktvAyvgQkOb/SIzsvOYaMnzFo6FPV/k JTRxeIgtVZEuVtbS/hBXTm/BZmzV2OShz/aebclSdn9Xey6nCKo3ZUZ4kOopD36/c8 NgTD+FjYX8Css5AWdEYAUwYxAlqkQj0gfei6UecY= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH v2 3/4] arm64: kprobes: Move exception_text check in blacklist Date: Tue, 15 Jan 2019 15:25:05 +0900 Message-Id: <154753350520.31541.11995657762766497151.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox> References: <154753341900.31541.8135985235882849464.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190114_222528_904029_7436B554 X-CRM114-Status: GOOD ( 11.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , linux-kernel , James Morse , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, "David A . Long" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move exception/irqentry text address check in blacklist, since those are symbol based rejection. If we prohibit probing on the symbols in exception_text, those should be blacklisted. Signed-off-by: Masami Hiramatsu Reviewed-by: James Morse --- arch/arm64/kernel/probes/kprobes.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index 1dae500d0a81..b9e9758b6534 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -98,9 +98,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) /* copy instruction */ p->opcode = le32_to_cpu(*p->addr); - if (in_exception_text(probe_addr)) - return -EINVAL; - if (search_exception_tables(probe_addr)) return -EINVAL; @@ -475,7 +472,8 @@ bool arch_within_kprobe_blacklist(unsigned long addr) (addr >= (unsigned long)__entry_text_start && addr < (unsigned long)__entry_text_end) || (addr >= (unsigned long)__idmap_text_start && - addr < (unsigned long)__idmap_text_end)) + addr < (unsigned long)__idmap_text_end) || + in_exception_text(addr)) return true; if (!is_kernel_in_hyp_mode()) { From patchwork Tue Jan 15 06:25:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10764015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A247C13BF for ; Tue, 15 Jan 2019 06:26:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 915262B0B6 for ; Tue, 15 Jan 2019 06:26:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84FEF2BAC4; Tue, 15 Jan 2019 06:26:01 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3743D2B0B6 for ; Tue, 15 Jan 2019 06:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MBwmk1qG7tLa6ZLMbrs+4BSEjkQX1ZlWcYv1qb41Jrs=; b=s1NjJKFqYRVEC6 gFSO0V7ZHvu+YrcEYjXAQsfwhGfPK7tqW23wTd5CpTiy5gdtQYqUt53/VYkadj/Z2yEGEZosS0MQf 9WoGYe3+Hh4vly4z35Yaa8sxqoUZZuQhjsK7u9tZUSY/lHCjv1wf1ME4BJTkV6IlQVdir+QCDlsL/ /lOx5CDFxtMuCl8rSyKrRx1t1R1cxPpZzzuF2hs2Ujsh2unl4uNbj8JoRHvoR1+OBpbnz4qHHwi5k n3qWQU+skb5Y8Yk1hejZlt5ufzV4jmt/+VVIu7Sjda1f0ptfliISqK1PAZAhMP9PqKvlksLyONk9y YmHUHPCW7AKyd9NxT9WQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjIAh-0007Ew-OA; Tue, 15 Jan 2019 06:25:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjIAf-0007EL-5t for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2019 06:25:58 +0000 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 A105220651; Tue, 15 Jan 2019 06:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547533556; bh=c3cvMz1HCpmGl/imOyH/ipMAfTvysPlZuDxCV5MItjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jiGtl9juScFfW2sBrGxgUaVX/ak2eqEJp8+NKHvesiTC9yjB2ELFuuKgqG4lsoYTh cGr30LDQpxgCucetQyrsnaDUnv5BZ/AUv90BUwc9lmNJpne7BcQxTPUbisWM8GQfID rjaxLB8UaByVvSqLzsMv1A518K6PF1sT6KunuTfc= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH v2 4/4] arm64: kprobes: Use arch_populate_kprobe_blacklist() Date: Tue, 15 Jan 2019 15:25:33 +0900 Message-Id: <154753353370.31541.14485875717131836689.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154753341900.31541.8135985235882849464.stgit@devbox> References: <154753341900.31541.8135985235882849464.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190114_222557_248780_EBA71658 X-CRM114-Status: GOOD ( 12.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , linux-kernel , James Morse , Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, "David A . Long" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use arch_populate_kprobe_blacklist() instead of arch_within_kprobe_blacklist() so that we can see the full blacklisted symbols under the debugfs. Signed-off-by: Masami Hiramatsu --- arch/arm64/kernel/probes/kprobes.c | 42 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index b9e9758b6534..6c066c34c8a4 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -465,26 +465,30 @@ kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr) return DBG_HOOK_HANDLED; } -bool arch_within_kprobe_blacklist(unsigned long addr) +int __init arch_populate_kprobe_blacklist(void) { - if ((addr >= (unsigned long)__kprobes_text_start && - addr < (unsigned long)__kprobes_text_end) || - (addr >= (unsigned long)__entry_text_start && - addr < (unsigned long)__entry_text_end) || - (addr >= (unsigned long)__idmap_text_start && - addr < (unsigned long)__idmap_text_end) || - in_exception_text(addr)) - return true; - - if (!is_kernel_in_hyp_mode()) { - if ((addr >= (unsigned long)__hyp_text_start && - addr < (unsigned long)__hyp_text_end) || - (addr >= (unsigned long)__hyp_idmap_text_start && - addr < (unsigned long)__hyp_idmap_text_end)) - return true; - } - - return false; + int ret; + + ret = kprobe_add_area_blacklist((unsigned long)__kprobes_text_start, + (unsigned long)__kprobes_text_end); + if (ret) + return ret; + ret = kprobe_add_area_blacklist((unsigned long)__entry_text_start, + (unsigned long)__entry_text_end); + if (ret) + return ret; + ret = kprobe_add_area_blacklist((unsigned long)__idmap_text_start, + (unsigned long)__idmap_text_end); + if (ret || is_kernel_in_hyp_mode()) + return ret; + + ret = kprobe_add_area_blacklist((unsigned long)__hyp_text_start, + (unsigned long)__hyp_text_end); + if (ret) + return ret; + ret = kprobe_add_area_blacklist((unsigned long)__hyp_idmap_text_start, + (unsigned long)__hyp_idmap_text_end); + return ret; } void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)