From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
jolsa@kernel.org, tglx@linutronix.de, namhyung@kernel.org
Subject: [tip:perf/core] perf ui/tui: Fix off-by-one in hist_browser__update_nr_entries()
Date: Fri, 25 Apr 2014 06:14:46 -0700 [thread overview]
Message-ID: <tip-c481f9301183260a78e55fa4d70d977b68c81846@git.kernel.org> (raw)
In-Reply-To: <1398327843-31845-9-git-send-email-namhyung@kernel.org>
Commit-ID: c481f9301183260a78e55fa4d70d977b68c81846
Gitweb: http://git.kernel.org/tip/c481f9301183260a78e55fa4d70d977b68c81846
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Tue, 22 Apr 2014 13:56:11 +0900
Committer: Jiri Olsa <jolsa@kernel.org>
CommitDate: Thu, 24 Apr 2014 16:33:08 +0200
perf ui/tui: Fix off-by-one in hist_browser__update_nr_entries()
The nr_entries variable is increased inside the loop in the function
but it always count the first entry regardless of it's filtered or
not; caused an off-by-one error.
It'd become a problem especially there's no entry at all - it'd get a
segfault during referencing a NULL pointer.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1398327843-31845-9-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/ui/browsers/hists.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4d41698..311226e 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1348,10 +1348,10 @@ static void hist_browser__update_pcnt_entries(struct hist_browser *hb)
u64 nr_entries = 0;
struct rb_node *nd = rb_first(&hb->hists->entries);
- while (nd) {
+ while ((nd = hists__filter_entries(nd, hb->hists,
+ hb->min_pcnt)) != NULL) {
nr_entries++;
- nd = hists__filter_entries(rb_next(nd), hb->hists,
- hb->min_pcnt);
+ nd = rb_next(nd);
}
hb->nr_pcnt_entries = nr_entries;
next prev parent reply other threads:[~2014-04-25 13:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 8:23 [PATCHSET 00/11] perf tools: Fixup for the --percentage change (v3) Namhyung Kim
2014-04-24 8:23 ` [PATCH 01/11] perf report: Count number of entries separately Namhyung Kim
2014-04-25 13:13 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 02/11] perf hists: Rename hists__inc_stats() Namhyung Kim
2014-04-25 13:13 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 03/11] perf hists: Move column length calculation out of hists__inc_stats() Namhyung Kim
2014-04-25 13:13 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 04/11] perf hists: Add a couple of hists stat helper functions Namhyung Kim
2014-04-24 9:40 ` Jiri Olsa
2014-04-24 12:57 ` Namhyung Kim
2014-04-24 13:12 ` Jiri Olsa
2014-04-24 13:46 ` Namhyung Kim
2014-04-25 13:13 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 05/11] perf hists: Collapse expanded callchains after filter is applied Namhyung Kim
2014-04-25 13:14 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 06/11] perf tools: Account entry stats when it's added to the output tree Namhyung Kim
2014-04-25 13:14 ` [tip:perf/core] perf tools: Account entry stats when it' s " tip-bot for Namhyung Kim
2014-04-24 8:23 ` [PATCH 07/11] perf hists: Add missing update on filtered stats in hists__decay_entries() Namhyung Kim
2014-04-25 13:14 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:24 ` [PATCH 08/11] perf ui/tui: Fix off-by-one in hist_browser__update_nr_entries() Namhyung Kim
2014-04-25 13:14 ` tip-bot for Namhyung Kim [this message]
2014-04-24 8:24 ` [PATCH 09/11] perf ui/tui: Rename hist_browser__update_nr_entries() Namhyung Kim
2014-04-25 13:14 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:24 ` [PATCH 10/11] perf top/tui: Update nr_entries properly after a filter is applied Namhyung Kim
2014-04-25 13:15 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 8:24 ` [PATCH 11/11] perf hists/tui: Count callchain rows separately Namhyung Kim
2014-04-25 13:15 ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 11:34 ` [PATCHSET 00/11] perf tools: Fixup for the --percentage change (v3) Jiri Olsa
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=tip-c481f9301183260a78e55fa4d70d977b68c81846@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).