diff options
| author | Tzvetomir Stoyanov (VMware) <[email protected]> | 2020-07-21 21:16:47 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2020-08-06 09:26:33 -0300 |
| commit | b796162bc4ee49d94b2cc59f98f6d32b5b517141 (patch) | |
| tree | f182e56a07edae961537c01be802116c675a0b18 | |
| parent | 7db6330dca8ffcc89b3d01300f4876d69ec884b7 (diff) | |
libtraceevent: Improve error handling of tep_plugin_add_option() API
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/[email protected]
Link: https://lore.kernel.org/linux-trace-devel/[email protected]
Suggested-by: Namhyung Kim <[email protected]>
Signed-off-by: Tzvetomir Stoyanov (VMware) <[email protected]>
Acked-by: Namhyung Kim <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
| -rw-r--r-- | tools/lib/traceevent/event-plugin.c | 16 |
1 files 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; } |