From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65EE118622 for ; Fri, 3 Nov 2023 16:05:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="V+svcMXQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6F97C433C8; Fri, 3 Nov 2023 16:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699027537; bh=42XsnqbyTprpNrPutNcSPJ0ocVxY+O1eGVuizrcPzPQ=; h=From:To:Cc:Subject:Date:From; b=V+svcMXQEE59e8NPP7hQaymVRI7+VVp25l2JUTUbXDECOKKN861W2FmBlBxlKec0N oIhfNvDvozXf9p6d6mDUeEypsztSH8kiFpUle4boNbuaNWbBoQUNVvyhjCCZqDY+Dl l7fYuhH4UTA34U3ZD3eA25HO78vEYVcI27runOsQQOab01ZaVPXLcK4qnhqsDy2gKw RiuUw80Us8P/qQeLekoske5zOezrthQeuacT9iwaG71tKjB/GN6VmfHODhAxoP0CK7 benfgQGdCkfGW2Qtv+DZJpVBe9qf3FpxhiVQfxTREbUSei0reVuAqnN5j2E+v7pJ3P HkQAe2Z8p4tcg== From: "Masami Hiramatsu (Google)" To: linux-trace-kernel@vger.kernel.org, Steven Rostedt Cc: linux-kernel@vger.kernel.org, mhiramat@kernel.org Subject: [PATCH] tracing: fprobe-event: Fix to check tracepoint event and return Date: Sat, 4 Nov 2023 01:05:34 +0900 Message-Id: <169902753361.313086.6662802092416198593.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit From: Masami Hiramatsu (Google) Fix to check the tracepoint event is not valid with $retval. The commit 08c9306fc2e3 ("tracing/fprobe-event: Assume fprobe is a return event by $retval") introduced automatic return probe conversion with $retval. But since tracepoint event does not support return probe, $retval is not acceptable. Fixes: 08c9306fc2e3 ("tracing/fprobe-event: Assume fprobe is a return event by $retval") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_fprobe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index 8bfe23af9c73..7d2ddbcfa377 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -927,11 +927,12 @@ static int parse_symbol_and_return(int argc, const char *argv[], for (i = 2; i < argc; i++) { tmp = strstr(argv[i], "$retval"); if (tmp && !isalnum(tmp[7]) && tmp[7] != '_') { + if (is_tracepoint) { + trace_probe_log_set_index(i); + trace_probe_log_err(tmp - argv[i], RETVAL_ON_PROBE); + return -EINVAL; + } *is_return = true; - /* - * NOTE: Don't check is_tracepoint here, because it will - * be checked when the argument is parsed. - */ break; } }