lkml.org 
[lkml]   [2014]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] perf tools: fix off-by-one error in maps
From
On Sun, Oct 5, 2014 at 9:23 PM, Jiri Olsa <jolsa@redhat.com> wrote:
> On Fri, Oct 03, 2014 at 12:47:07PM +0200, Stephane Eranian wrote:
>>
>
> SNIP
>
>> 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);
>
> hum, do we also need this one then?
>
> ---
> diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
> index 9e2c71e51fce..186418ba18db 100644
> --- a/tools/perf/util/map.c
> +++ b/tools/perf/util/map.c
> @@ -664,7 +664,7 @@ int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
> goto move_map;
> }
>
> - before->end = map->start - 1;
> + before->end = map->start;
Start is first byte of next range, so it is pointing to one byte after
the end of the before range.
So, yes, I think we need your fix as well. I missed it. Will repost.

> map_groups__insert(mg, before);
> if (verbose >= 2)
> map__fprintf(before, fp);


\
 
 \ /
  Last update: 2014-10-05 22:21    [W:0.068 / U:0.844 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site