From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, namhyung@kernel.org
Subject: [PATCH 4/8] tools lib traceevent: Improve error handling of tep_plugin_add_option() API
Date: Thu, 16 Jul 2020 12:20:10 +0300 [thread overview]
Message-ID: <20200716092014.2613403-5-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200716092014.2613403-1-tz.stoyanov@gmail.com>
In case of memory error, ensure all allocated resources are freed.
Do not append broken option in trace_plugin_options list.
Link: https://lore.kernel.org/r/CAM9d7cizjF+fbK7YzmsBDgrx__4YAOsmEq67D3sWET8FF+YdFA@mail.gmail.com
Link: https://lore.kernel.org/linux-trace-devel/20200714103027.2477584-5-tz.stoyanov@gmail.com
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/lib/traceevent/event-plugin.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
index f8d253a61970..6b84b9c4e6ba 100644
--- a/tools/lib/traceevent/event-plugin.c
+++ b/tools/lib/traceevent/event-plugin.c
@@ -361,23 +361,25 @@ int tep_plugin_add_option(const char *name, const char *val)
if (!op) {
op = malloc(sizeof(*op));
if (!op)
- return -ENOMEM;
+ goto out_free;
memset(op, 0, sizeof(*op));
- op->next = trace_plugin_options;
- trace_plugin_options = op;
-
op->plugin = plugin;
op->option = option_str;
-
if (val) {
op->value = strdup(val);
- if (!op->value)
+ if (!op->value) {
+ free(op);
goto out_free;
+ }
}
+ op->next = trace_plugin_options;
+ trace_plugin_options = op;
}
return process_option(plugin, option_str, val);
- out_free:
+
+out_free:
+ free(plugin);
free(option_str);
return -ENOMEM;
}
--
2.26.2
next prev parent reply other threads:[~2020-07-16 9:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 9:20 [PATCH 0/8] Backported libtraceevent fixes, suggested by Namhyung Kim Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 1/8] tools lib traceevent: Document tep_load_plugins_hook() Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 2/8] tools lib traceevent: Handle strdup() error in parse_option_name() Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 3/8] tools lib traceevent: Fix typo in tep_plugin_add_option() description Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` Tzvetomir Stoyanov (VMware) [this message]
2020-07-16 9:20 ` [PATCH 5/8] tools lib traceevent: Fixed broken indentation in parse_ip4_print_args() Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 6/8] tools lib traceevent: Fixed type in PRINT_FMT_STING Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 7/8] tools lib traceevent: Fixed description of tep_add_plugin_path() API Tzvetomir Stoyanov (VMware)
2020-07-16 9:20 ` [PATCH 8/8] tools lib traceevent: Handle possible strdup() error in " Tzvetomir Stoyanov (VMware)
-- strict thread matches above, loose matches on Subject: below --
2020-07-16 9:19 [PATCH 0/8] Backported libtraceevent fixes, suggested by Namhyung Kim Tzvetomir Stoyanov (VMware)
2020-07-16 9:19 ` [PATCH 4/8] tools lib traceevent: Improve error handling of tep_plugin_add_option() API Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200716092014.2613403-5-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).