From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09F31C43381 for ; Thu, 14 Mar 2019 04:30:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C769D21855 for ; Thu, 14 Mar 2019 04:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552537847; bh=4GiRQpq9LUgRMh3x3hONvSNTDyhCcbLinhvIGdwdtyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k0Iw2IeartAMllDLKMB0FhKez3OXR5/FM3Q4umTNQFUq3vklnr9IzcYwNMgnBf49f Lc8KeKahqJCenRb1EwFBkAcgGtSTngNC/hJ/tZZB0zV6M+I/WnkCvAprvWVjmYmjBJ I9ze7efV2wcS+GeJIvr46C+i9FhricgrFbyzzpQE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727137AbfCNEaq (ORCPT ); Thu, 14 Mar 2019 00:30:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:47726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727093AbfCNEaq (ORCPT ); Thu, 14 Mar 2019 00:30:46 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 51DC62184C; Thu, 14 Mar 2019 04:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552537845; bh=4GiRQpq9LUgRMh3x3hONvSNTDyhCcbLinhvIGdwdtyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yaA2fcxCwCNmJ5Z7aBLV7heT575cPQFnQIWc+VvmbWjWjS+hjhPcKzGWOIHNOw8hq fxZ7jaYSGWNW6gZ2/9jlWpUQ9aIZrrAjI5uOeHs/r5FJDAL8H8pFXGIgvMT8m+2dyn aTTL9qTbUAZG98RSO/+sRlzTaz4BuiLIyvfrh1Po= From: Masami Hiramatsu To: Tom Zanussi , Steven Rostedt Cc: tglx@linutronix.de, mhiramat@kernel.org, namhyung@kernel.org, bigeasy@linutronix.de, joel@joelfernandes.org, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Subject: [RFC PATCH v2 4/7] tracing/probe: Check event/group naming rule at parsing Date: Thu, 14 Mar 2019 13:30:40 +0900 Message-Id: <155253784064.14922.2336893061156236237.stgit@devnote2> X-Mailer: git-send-email 2.17.1 In-Reply-To: <155253778926.14922.14048967363017104338.stgit@devnote2> References: <155253778926.14922.14048967363017104338.stgit@devnote2> 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check event and group naming rule at parsing it instead of allocating probes. Signed-off-by: Masami Hiramatsu --- Changes in v2: - Update error message according to Steve's comment. --- kernel/trace/trace_kprobe.c | 7 +------ kernel/trace/trace_probe.c | 8 ++++++++ kernel/trace/trace_uprobe.c | 5 +---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index d47e12596f12..5222fd82e7e4 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -221,7 +221,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, tk->rp.maxactive = maxactive; - if (!event || !is_good_name(event)) { + if (!event || !group) { ret = -EINVAL; goto error; } @@ -231,11 +231,6 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, if (!tk->tp.call.name) goto error; - if (!group || !is_good_name(group)) { - ret = -EINVAL; - goto error; - } - tk->tp.class.system = kstrdup(group, GFP_KERNEL); if (!tk->tp.class.system) goto error; diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index feae03056f0b..d2b73628f1e1 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -172,6 +172,10 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup, return -E2BIG; } strlcpy(buf, event, slash - event + 1); + if (!is_good_name(buf)) { + pr_info("Group name must follow the same rules as C identifiers\n"); + return -EINVAL; + } *pgroup = buf; *pevent = slash + 1; event = *pevent; @@ -184,6 +188,10 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup, pr_info("Event name is too long\n"); return -E2BIG; } + if (!is_good_name(event)) { + pr_info("Event name must follow the same rules as C identifiers\n"); + return -EINVAL; + } return 0; } diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index e335576b9411..52f033489377 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -266,10 +266,7 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret) { struct trace_uprobe *tu; - if (!event || !is_good_name(event)) - return ERR_PTR(-EINVAL); - - if (!group || !is_good_name(group)) + if (!event || !group) return ERR_PTR(-EINVAL); tu = kzalloc(SIZEOF_TRACE_UPROBE(nargs), GFP_KERNEL);