From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: acme@redhat.com, jolsa@redhat.com, namhyung@kernel.org,
peterz@infradead.org, mingo@elte.hu, dsahern@gmail.com
Subject: [PATCH] perf tools: fix off-by-one error in maps
Date: Fri, 3 Oct 2014 12:47:07 +0200 [thread overview]
Message-ID: <20141003104707.GA4435@quad> (raw)
This patch fixes off-by-one errors in the management
of maps. A map is defined by start address and length
as implemented by map__new():
map__init(map, type, start, start + len, pgoff, dso);
map__init()
{
map->start = addr;
map->end = end;
}
Consequently, the actual address range is ]start; end[
map->end is the first byte outside the range. This patch
fixes two bugs where upper bounds were off-by-one.
Signed-off-by: Stephane Eranian <eranian@google.com>
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index b709059..9e2c71e 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -556,7 +556,7 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
int map_groups__find_ams(struct addr_map_symbol *ams, symbol_filter_t filter)
{
- if (ams->addr < ams->map->start || ams->addr > ams->map->end) {
+ if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {
if (ams->map->groups == NULL)
return -1;
ams->map = map_groups__find(ams->map->groups, ams->map->type,
@@ -678,7 +678,7 @@ int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
goto move_map;
}
- after->start = map->end + 1;
+ after->start = map->end;
map_groups__insert(mg, after);
if (verbose >= 2)
map__fprintf(after, fp);
next reply other threads:[~2014-10-03 10:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-03 10:47 Stephane Eranian [this message]
2014-10-05 19:23 ` [PATCH] perf tools: fix off-by-one error in maps Jiri Olsa
2014-10-05 19:44 ` Stephane Eranian
2014-10-06 15:18 ` Arnaldo Carvalho de Melo
2014-10-06 19:57 ` Stephane Eranian
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=20141003104707.GA4435@quad \
--to=eranian@google.com \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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