diff options
| author |  Christophe JAILLET <christophe.jaillet@wanadoo.fr>
| 2017-09-16 08:25:37 +0200 |
|---|---|---|
| committer |  Arnaldo Carvalho de Melo <acme@redhat.com>
| 2017-10-23 16:30:53 -0300 |
| commit | db49bc155ad9f04ea3c4e1c9ae87850610feb1ce (patch) | |
| tree | ad3a1e1020613fb3f34111a696b5e506a715a2a5 /tools/perf | |
| parent | perf script: Use fprintf like printing uniformly (diff) | |
| download | linux-db49bc155ad9f04ea3c4e1c9ae87850610feb1ce.tar.gz linux-db49bc155ad9f04ea3c4e1c9ae87850610feb1ce.tar.bz2 linux-db49bc155ad9f04ea3c4e1c9ae87850610feb1ce.zip | |
perf script: Fix error handling path
If the string passed in '--time' is invalid, or if failed to set
libtraceevent function resolver, we must do some cleanup before leaving.
As in the other error handling paths of this function.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20170916062537.28921-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-script.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 3e83f4735b21..a3add2cd7856 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3074,7 +3074,8 @@ int cmd_script(int argc, const char **argv) machine__resolve_kernel_addr, &session->machines.host) < 0) { pr_err("%s: failed to set libtraceevent function resolver\n", __func__); - return -1; + err = -1; + goto out_delete; } if (generate_script_lang) { @@ -3134,7 +3135,8 @@ int cmd_script(int argc, const char **argv) /* needs to be parsed after looking up reference time */ if (perf_time__parse_str(&script.ptime, script.time_str) != 0) { pr_err("Invalid time string\n"); - return -EINVAL; + err = -EINVAL; + goto out_delete; } err = __cmd_script(&script); |