perf probe: Fix concat_probe_trace_events
authorRavi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Wed, 8 Mar 2017 06:59:07 +0000 (12:29 +0530)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 20 Mar 2017 18:01:32 +0000 (15:01 -0300)
'*ntevs' contains number of elements present in 'tevs' array. If there
are no elements in array, 'tevs2' can be directly assigned to 'tevs'
without allocating more space. So the condition should be  '*ntevs == 0'
not  'ntevs == 0'.

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 42bba263eb58 ("perf probe: Allow wildcard for cached events")
Link: http://lkml.kernel.org/r/20170308065908.4128-1-ravi.bangoria@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/probe-event.c

index b19d17801beb96b3223093c37623074acac58123..6740d6812691df9db3345bce49f9e7ff9d9798d4 100644 (file)
@@ -3048,7 +3048,7 @@ concat_probe_trace_events(struct probe_trace_event **tevs, int *ntevs,
        struct probe_trace_event *new_tevs;
        int ret = 0;
 
-       if (ntevs == 0) {
+       if (*ntevs == 0) {
                *tevs = *tevs2;
                *ntevs = ntevs2;
                *tevs2 = NULL;