From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743AbdKDEbR (ORCPT ); Sat, 4 Nov 2017 00:31:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:42538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbdKDEbQ (ORCPT ); Sat, 4 Nov 2017 00:31:16 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1ECD6218B6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: Russell King , Jon Medhurst Cc: Arnd Bergmann , Mark Brown , Ingo Molnar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Wang Nan , Stephen Rothwell Subject: [PATCH -next 1/2] arm: kprobes: Fix kretprobe test to check correct counter Date: Sat, 4 Nov 2017 13:30:52 +0900 Message-Id: <150976985182.2012.15495311380682779381.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <150976982219.2012.12861503668350308669.stgit@devbox> References: <150976982219.2012.12861503668350308669.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org test_kretprobe() uses jprobe_func_called at the last test, but it must check kretprobe_handler_called. Signed-off-by: Masami Hiramatsu --- arch/arm/probes/kprobes/test-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c index 1c98a87786ca..9c3ceba69015 100644 --- a/arch/arm/probes/kprobes/test-core.c +++ b/arch/arm/probes/kprobes/test-core.c @@ -451,7 +451,7 @@ static int test_kretprobe(long (*func)(long, long)) } if (!call_test_func(func, false)) return -EINVAL; - if (jprobe_func_called == test_func_instance) { + if (kretprobe_handler_called == test_func_instance) { pr_err("FAIL: kretprobe called after unregistering\n"); return -EINVAL; }