Skip to content

Commit 77faf4d

Browse files
Stephane Eranianacmel
authored andcommitted
perf tools: fix off-by-one error in maps
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->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 bound checking was off-by-one. In V2, we fix map_groups__fixup_overlappings() some more where map->start was off-by-one as reported by Jiri. Signed-off-by: Stephane Eranian <[email protected]> Acked-by: Namhyung Kim <[email protected]> Cc: David Ahern <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/20141006083532.GA4850@quad Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent e167f99 commit 77faf4d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/perf/util/map.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
556556

557557
int map_groups__find_ams(struct addr_map_symbol *ams, symbol_filter_t filter)
558558
{
559-
if (ams->addr < ams->map->start || ams->addr > ams->map->end) {
559+
if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {
560560
if (ams->map->groups == NULL)
561561
return -1;
562562
ams->map = map_groups__find(ams->map->groups, ams->map->type,
@@ -664,7 +664,7 @@ int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
664664
goto move_map;
665665
}
666666

667-
before->end = map->start - 1;
667+
before->end = map->start;
668668
map_groups__insert(mg, before);
669669
if (verbose >= 2)
670670
map__fprintf(before, fp);
@@ -678,7 +678,7 @@ int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
678678
goto move_map;
679679
}
680680

681-
after->start = map->end + 1;
681+
after->start = map->end;
682682
map_groups__insert(mg, after);
683683
if (verbose >= 2)
684684
map__fprintf(after, fp);

0 commit comments

Comments
 (0)