4 files changed, 38 insertions, 3 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index fab0a1c7e872..8ef59f8262bb 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -42,6 +42,7 @@
 #include "util/debug.h"
 
 #include <assert.h>
+#include <elf.h>
 #include <fcntl.h>
 
 #include <stdio.h>
@@ -59,6 +60,7 @@
 #include <sys/prctl.h>
 #include <sys/wait.h>
 #include <sys/uio.h>
+#include <sys/utsname.h>
 #include <sys/mman.h>
 
 #include <linux/unistd.h>
@@ -162,12 +164,40 @@ static void __zero_source_counters(struct hist_entry *he)
         symbol__annotate_zero_histograms(sym);
 }
 
+static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip)
+{
+        struct utsname uts;
+        int err = uname(&uts);
+
+        ui__warning("Out of bounds address found:\n\n"
+                    "Addr:   %" PRIx64 "\n"
+                    "DSO:    %s %c\n"
+                    "Map:    %" PRIx64 "-%" PRIx64 "\n"
+                    "Symbol: %" PRIx64 "-%" PRIx64 " %c %s\n"
+                    "Arch:   %s\n"
+                    "Kernel: %s\n"
+                    "Tools:  %s\n\n"
+                    "Not all samples will be on the annotation output.\n\n"
+                    "Please report to linux-kernel@vger.kernel.org\n",
+                    ip, map->dso->long_name, dso__symtab_origin(map->dso),
+                    map->start, map->end, sym->start, sym->end,
+                    sym->binding == STB_GLOBAL ? 'g' :
+                    sym->binding == STB_LOCAL  ? 'l' : 'w', sym->name,
+                    err ? "[unknown]" : uts.machine,
+                    err ? "[unknown]" : uts.release, perf_version_string);
+        if (use_browser <= 0)
+                sleep(5);
+        
+        map->erange_warned = true;
+}
+
 static void perf_top__record_precise_ip(struct perf_top *top,
                                         struct hist_entry *he,
                                         int counter, u64 ip)
 {
         struct annotation *notes;
         struct symbol *sym;
+        int err;
 
         if (he == NULL || he->ms.sym == NULL ||
             ((top->sym_filter_entry == NULL ||
@@ -189,9 +219,12 @@ static void perf_top__record_precise_ip(struct perf_top *top,
         }
 
         ip = he->ms.map->map_ip(he->ms.map, ip);
-        symbol__inc_addr_samples(sym, he->ms.map, counter, ip);
+        err = symbol__inc_addr_samples(sym, he->ms.map, counter, ip);
 
         pthread_mutex_unlock(&notes->lock);
+
+        if (err == -ERANGE && !he->ms.map->erange_warned)
+                ui__warn_map_erange(he->ms.map, sym, ip);
 }
 
 static void perf_top__show_details(struct perf_top *top)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 70f5a4dc17e9..08c6d138a655 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -64,8 +64,8 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
 
         pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));
 
-        if (addr > sym->end)
-                return 0;
+        if (addr < sym->start || addr > sym->end)
+                return -ERANGE;
 
         offset = addr - sym->start;
         h = annotation__histogram(notes, evidx);
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index dea6d1c1a954..35ae56864e4f 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -38,6 +38,7 @@ void map__init(struct map *self, enum map_type type,
         RB_CLEAR_NODE(&self->rb_node);
         self->groups   = NULL;
         self->referenced = false;
+        self->erange_warned = false;
 }
 
 struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index b100c20b7f94..81371bad4ef0 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -33,6 +33,7 @@ struct map {
         u64                     end;
         u8 /* enum map_type */  type;
         bool                    referenced;
+        bool                    erange_warned;
         u32                     priv;
         u64                     pgoff;