perf inject: Fix segfault due to perf_data__fd() without open

[platform/kernel/linux-rpi.git] / tools / perf / builtin-inject.c

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 4e19bfb..50c2e68 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -755,12 +755,16 @@ static int parse_vm_time_correlation(const struct option *opt, const char *str,
        return inject->itrace_synth_opts.vm_tm_corr_args ? 0 : -ENOMEM;
 }
 
+static int output_fd(struct perf_inject *inject)
+{
+       return inject->in_place_update ? -1 : perf_data__fd(&inject->output);
+}
+
 static int __cmd_inject(struct perf_inject *inject)
 {
        int ret = -EINVAL;
        struct perf_session *session = inject->session;
-       struct perf_data *data_out = &inject->output;
-       int fd = inject->in_place_update ? -1 : perf_data__fd(data_out);
+       int fd = output_fd(inject);
        u64 output_data_offset;
 
        signal(SIGINT, sig_handler);
@@ -1006,7 +1010,7 @@ int cmd_inject(int argc, const char **argv)
        }
 
        inject.session = __perf_session__new(&data, repipe,
-                                            perf_data__fd(&inject.output),
+                                            output_fd(&inject),
                                             &inject.tool);
        if (IS_ERR(inject.session)) {
                ret = PTR_ERR(inject.session);