From patchwork Mon Dec 17 06:40:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10732785 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 50C9B746 for ; Mon, 17 Dec 2018 06:41:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B9F529BAA for ; Mon, 17 Dec 2018 06:41:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 291B329BB0; Mon, 17 Dec 2018 06:41:31 +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 BA6BF29BAA for ; Mon, 17 Dec 2018 06:41:30 +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=TIKEupQkBIfyunLunWek32AqcHk/et4if2XiX9QvJjQ=; b=e6+2LjN3O04+Lr t+bZpyVnkn0HAFLr4rCj6BlJr0zKfpmv40DGKCCA7RHtXJzFo/tWtXwD0IctsSqVvoCf0ksiTL4jr /jb1lAY2rsbe/oxhtztk/nijKsilgNlW4MlCf+e7W2VBuEYUsgIGyVhnjuhTO1x6hkGK5K+fqLQpq jyQ4m1cwEbQ3Je2MSxkEPsd81U0xZgrThogGOKQegBgEkXUouAz6edDAM9nONX9H3795BVAfLJth+ dz60tP7GPEl+WY+ArekcRRXMOx6oP4sEdg3zRLS9zbgqv0TuDNNz/0Z9iq1gPOM36U6FrfNt2lNhN 1mMcAU9g2M+kmbVg32+g==; 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 1gYmah-00026S-76; Mon, 17 Dec 2018 06:41:23 +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 1gYmae-00024D-2P for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2018 06:41:21 +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 A7BDB21836; Mon, 17 Dec 2018 06:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545028869; bh=nNf0gTmJMa74Q9EkpaUfMP3gIptXZ/cJXADX5WaPAhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkoOTHrYJ8WM8dkS6/GQwr0GmQt7K938ULQ5uBIc5OdwxXukIxVIkyqV1b8SjIEvA vCUlYttBCfDQf3sikAMb8v33u+kO5QNyeTITCo7aRYpnyuoPclxlHucjMsNb3EzBsb Wg8wjkcAbMp47rdl5X6oJ4EFU8670r7D0ZWxms5w= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH 1/3] arm64: kprobes: Move extable address check into arch_prepare_kprobe() Date: Mon, 17 Dec 2018 15:40:46 +0900 Message-Id: <154502884653.30629.3172839440883293817.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154502881646.30629.9938335052821665530.stgit@devbox> References: <154502881646.30629.9938335052821665530.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-20181216_224120_146151_5C01E4B8 X-CRM114-Status: GOOD ( 10.98 ) 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 , 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(). Please do not blacklisting instructions on exception_table, since it is a kind of architectural unsupported instruction. Signed-off-by: Masami Hiramatsu Reviewed-by: James Morse --- 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 Mon Dec 17 06:41:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10732787 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 80A85746 for ; Mon, 17 Dec 2018 06:41:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68EEF29BAA for ; Mon, 17 Dec 2018 06:41:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A1A829BB0; Mon, 17 Dec 2018 06:41:55 +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 0A0D529BAA for ; Mon, 17 Dec 2018 06:41:55 +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=d75DXMWJSTj+Fi j2kr/9Iq+z6Bq+dPhnFHDZ51RaaYuwXOjHdUx1T5j3CO5ZUj4lKxa/YnTbbZlkP/ZRGAAe0zzsJkW lsn5QvwEHUJpNAC+7w9YHRElJfO6aS73zpwed8Bi5vRfFv2GZSCOZBx3lLHH9ilPsgNe3aPP5W37L +9Efe4fqOtMLB+VR5bhrZ5EylrApwgmkl2a9IwEYeg4cl40dQHa/h+uw6uTHS1qcmgkmSLF+PNN0h FwLpcN4Go4y3DLjrINPVSg3T25Q9XjrI5/B40ByoOsGFLgbXiuB5sVUd2udYVBem6jLz7qHD+Km59 tE4MZTs9o7Jw5iJ56fNQ==; 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 1gYmbB-0002XO-PD; Mon, 17 Dec 2018 06:41:53 +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 1gYmb6-0002UI-Kb for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2018 06:41:52 +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 4591820675; Mon, 17 Dec 2018 06:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545028898; bh=0xtxfZtFdIUmaXPj2hBVcHLm0ZupOdVKMg42UdHhv0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q7XHocSnVx+0Xra04NV3H5XEkQO0w0dGwg7DW9YnHqDAH4+2kQHIXXJA7bu6l906K b1UDTnU8XZA1ooJNxsoSwFFGgdJ7cHSOTEQyh1fr1UdIN+MeZoUJroxWFFwpVwzGRq 8eRdPK6OVNR90BgNON2fBzS5NoU59EpJxQo2NEr4= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH 2/3] arm64: kprobes: Remove unneeded RODATA check Date: Mon, 17 Dec 2018 15:41:15 +0900 Message-Id: <154502887509.30629.17754148993239954461.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154502881646.30629.9938335052821665530.stgit@devbox> References: <154502881646.30629.9938335052821665530.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-20181216_224148_685877_22E500B1 X-CRM114-Status: GOOD ( 10.99 ) 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 , 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: James Morse --- 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 Mon Dec 17 06:41:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10732789 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 ED59E746 for ; Mon, 17 Dec 2018 06:42:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9C7929BAF for ; Mon, 17 Dec 2018 06:42:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C818429BAA; Mon, 17 Dec 2018 06:42:22 +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 586FC29BAA for ; Mon, 17 Dec 2018 06:42:22 +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=ga+hUlqLq8m77J RxjebRV9Uvr1T3IZzbk6QiWJVM7EEJdPeLS7df+/7fUq1ln4IdseXO8SGgxvD//2aYWiw01R0XvxY AwKp95yaYRVLunHXypVl7t/pimxs5hhwN7Q/eOjofcwod72mnFIYv9rxDNiv8nGGLvfSemcy8JEBD 09d+FMzE14K8ErF/jha6pDRIlmCb9aMCQtqaqGkP1XCDBeIab3pihqqN1Kd+/UMQruLlRgyXYh/aI tA0RDxHkpCUbFkQiRePjmmdQt+jjbEdQUNvomBYXetsWLItG62kHpbXes++2WM4wWkzv/BgzACJlI GYTTNOmMo8kwDU4bV8SQ==; 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 1gYmbb-0002nD-TH; Mon, 17 Dec 2018 06:42:19 +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 1gYmbZ-0002jK-B5 for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2018 06:42:18 +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 DC63320675; Mon, 17 Dec 2018 06:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545028927; bh=QM7XOsAU0i1KQFQo/n6k/OXJ89dL3NSEi3PjGHYFhXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R78kjiVvc77VsubODTNB185MrmewUu7OIUJ/TRBZIQbH4rKuixQLTrMi97hRKryph 9FYcX/d7ivZ4tIchQjqNSJKbtEK986h3ON2A0u+nyUqbMycAZEAjvdC8X+5jMvrpMr FbacDQ9/ysMneVNvKeyBfiuQxkaSN8RCvsLIcPiU= From: Masami Hiramatsu To: Catalin Marinas , Will Deacon Subject: [PATCH 3/3] arm64: kprobes: Move exception_text check in blacklist Date: Mon, 17 Dec 2018 15:41:43 +0900 Message-Id: <154502890363.30629.6071608188122836265.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154502881646.30629.9938335052821665530.stgit@devbox> References: <154502881646.30629.9938335052821665530.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-20181216_224217_404624_7762029A X-CRM114-Status: GOOD ( 11.54 ) 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 , 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 --- 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()) {