From patchwork Fri May 4 04:15:29 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: 10379823 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 A1E0E603B4 for ; Fri, 4 May 2018 04:17:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EE9A29318 for ; Fri, 4 May 2018 04:17:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8345B2931B; Fri, 4 May 2018 04:17: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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 116B429318 for ; Fri, 4 May 2018 04:17:00 +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=2TYAeXT6OMUP7F7gFn+ZLGfuCZgseyGM5yDtxBSujIg=; b=aMN3oGYkwDufqp fP/rSvdpuW8G/d0ZHr5MCV6/hTUW2mnHM1kaE6Bo017KfvAtkFH9IXR6IfzNlizyAs06EptN1FCW9 iDCa4NM3SpsHriGSGl1Ygkd3CQqab4mY+LOoxbhba7t9cs/q9Vb9DLI6kNyesErOYh6Y9R91YNBY1 dC27vXIB0UM25kNu9NbYNHbBEfgWUezL+KRwEg+bnIrfFgZl94q8fgAf9qnqo/IVE3vSs9MpEnyTh 9TxrzWNBYUZK6txxHLCXUzPBWBDBMzWB6TTTNq+X+tK47U59FM0aZeGcCl0YZ4OGTYphxB7t2HSJu AoBCbz6h3pxXhNO5RNTg==; 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 1fES9I-0008GA-37; Fri, 04 May 2018 04:16:48 +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 1fES8Z-0007u9-EE for linux-arm-kernel@lists.infradead.org; Fri, 04 May 2018 04:16:12 +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 7E47F21716; Fri, 4 May 2018 04:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1525407352; bh=z0asb4C1Git98M6ZyaA3YOUXb1/ERXWlpB4T/luI6IE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uBdbMCWf2oxkR95O80vHNiwhkqC7cPrT91LewDuMsIAY1YBKqX342fQ+VmFHejqOB G80yltylHX2PjyVp9BWvWAJTGas6U38pKHVosIAoT8tNnuWN7j6VLNXVKDUlwDVaFe kX1DSZ23rFhqH1rwefrmShRKl+s041ZsuvPjN+zw= From: Masami Hiramatsu To: Russell King Subject: [BUGFIX PATCH v3 2/4] arm: kprobes: Prohibit probing on optimized_callback Date: Fri, 4 May 2018 13:15:29 +0900 Message-Id: <152540732952.29650.11645105922811248579.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <152540727123.29650.13679359124038587629.stgit@devbox> References: <152540727123.29650.13679359124038587629.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-20180503_211603_604976_46C9D791 X-CRM114-Status: GOOD ( 11.16 ) 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: Jon Medhurst , Wang Nan , Will Deacon , linux-kernel@vger.kernel.org, stable@vger.kernel.org, mhiramat@kernel.org, linux-arm-kernel@lists.infradead.org, David 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 Prohibit probing on optimized_callback() because it is called from kprobes itself. If we put a kprobes on it, that will cause a recursive call loop. Mark it NOKPROBE_SYMBOL. Fixes: 0dc016dbd820 ("ARM: kprobes: enable OPTPROBES for ARM 32") Signed-off-by: Masami Hiramatsu Cc: stable@vger.kernel.org --- arch/arm/probes/kprobes/opt-arm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c index ddc5a82eb10d..b2aa9b32bff2 100644 --- a/arch/arm/probes/kprobes/opt-arm.c +++ b/arch/arm/probes/kprobes/opt-arm.c @@ -192,6 +192,7 @@ optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs) local_irq_restore(flags); } +NOKPROBE_SYMBOL(optimized_callback) int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *orig) {