From: "Tzvetomir Stoyanov (VMware)" <tz.stoya...@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+y...@mail.gmail.com Link: https://lore.kernel.org/linux-trace-devel/20200714103027.2477584-5-tz.stoya...@gmail.com Link: https://lore.kernel.org/linux-trace-devel/20200716092014.2613403-5-tz.stoya...@gmail.com Suggested-by: Namhyung Kim <namhy...@kernel.org> Acked-by: Namhyung Kim <namhy...@kernel.org> Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoya...@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rost...@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
