All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 10/11] perf probe: Fix concat_probe_trace_events
Date: Mon, 20 Mar 2017 22:16:40 -0300	[thread overview]
Message-ID: <20170321011641.25763-11-acme@kernel.org> (raw)
In-Reply-To: <20170321011641.25763-1-acme@kernel.org>

From: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>

'*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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index b19d17801beb..6740d6812691 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -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;
-- 
2.9.3

  parent reply	other threads:[~2017-03-21  1:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-21  1:16 [GIT PULL 00/11] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-03-21  1:16 ` Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 01/11] perf lock: Subcommands should include common options Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 02/11] perf lock: Make 'f' part of the common 'lock_options' Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 03/11] perf timechart: Use OPT_PARENT for common options Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 04/11] tools lib api fs: Introduce sysfs__read_bool Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 05/11] tools include: Sync {,tools/}include/uapi/linux/perf_event.h Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 06/11] perf tools: Handle partial AUX records and print a warning Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 07/11] tools headers: Sync {tools/,}arch/x86/include/asm/cpufeatures.h Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 08/11] tools headers: Sync {tools/,}arch/arm{64}/include/uapi/asm/kvm.h Arnaldo Carvalho de Melo
2017-03-21  1:16 ` [PATCH 09/11] perf stat: Correct --no-aggr description Arnaldo Carvalho de Melo
2017-03-21  1:16 ` Arnaldo Carvalho de Melo [this message]
2017-03-21  1:16 ` [PATCH 11/11] tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h Arnaldo Carvalho de Melo
2017-03-21  6:43 ` [GIT PULL 00/11] perf/core improvements and fixes Ingo Molnar
2017-03-21  6:43   ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170321011641.25763-11-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=ravi.bangoria@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.