From patchwork Wed Jul 22 01:16:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11676915 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 138AE14E3 for ; Wed, 22 Jul 2020 01:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE41322D6E for ; Wed, 22 Jul 2020 01:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731769AbgGVBS3 (ORCPT ); Tue, 21 Jul 2020 21:18:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:37176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731657AbgGVBR4 (ORCPT ); Tue, 21 Jul 2020 21:17:56 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 EA84022CA1; Wed, 22 Jul 2020 01:17:55 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.93) (envelope-from ) id 1jy3OM-005sG6-W6; Tue, 21 Jul 2020 21:17:55 -0400 Message-ID: <20200722011754.869289038@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 21 Jul 2020 21:16:45 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-devel@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Jiri Olsa , Namhyung Kim , Andrew Morton , "Tzvetomir Stoyanov (VMware)" Subject: [PATCH 17/23 v3] tools lib traceevent: Handle strdup() error in parse_option_name() References: <20200722011628.925541477@goodmis.org> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Tzvetomir Stoyanov (VMware)" Modified internal function parse_option_name() to return error and handle that error in function callers in case strdup() fails. Link: https://lore.kernel.org/r/CAM9d7cizjF+fbK7YzmsBDgrx__4YAOsmEq67D3sWET8FF+YdFA@mail.gmail.com Link: https://lore.kernel.org/linux-trace-devel/20200714103027.2477584-3-tz.stoyanov@gmail.com Link: https://lore.kernel.org/linux-trace-devel/20200716092014.2613403-3-tz.stoyanov@gmail.com Suggested-by: Namhyung Kim Acked-by: Namhyung Kim Signed-off-by: Tzvetomir Stoyanov (VMware) Signed-off-by: Steven Rostedt (VMware) --- tools/lib/traceevent/event-plugin.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c index aa6f43290cd3..a39eeb6ef1f2 100644 --- a/tools/lib/traceevent/event-plugin.c +++ b/tools/lib/traceevent/event-plugin.c @@ -254,7 +254,7 @@ void tep_plugin_remove_options(struct tep_plugin_option *options) } } -static void parse_option_name(char **option, char **plugin) +static int parse_option_name(char **option, char **plugin) { char *p; @@ -265,8 +265,9 @@ static void parse_option_name(char **option, char **plugin) *p = '\0'; *option = strdup(p + 1); if (!*option) - return; + return -1; } + return 0; } static struct tep_plugin_option * @@ -325,7 +326,8 @@ int tep_plugin_add_option(const char *name, const char *val) if (!option_str) return -ENOMEM; - parse_option_name(&option_str, &plugin); + if (parse_option_name(&option_str, &plugin) < 0) + return -ENOMEM; /* If the option exists, update the val */ for (op = trace_plugin_options; op; op = op->next) {