Em Wed, Jan 14, 2015 at 08:18:05PM +0900, Namhyung Kim escreveu:
> Currently the symbol structure is allocated with symbol_conf.priv_size
> to carry sideband information like annotation, map browser on TUI and
> sort-by-name tree node. So retrieving these information from symbol
> needs to care about the details of such placement.
>
> However the annotation code just assumes that the symbol is placed after
> the struct annotation. But actually there's other info between them.
> So accessing those struct will lead to an undefined behavior (usually a
> crash) after they write their info to the same location.
>
> To reproduce the problem, please follow the steps below:
>
> 1. run perf report (TUI of course) with -v option
> 2. open map browser (by pressing right arrow key for any entry)
> 3. search any function (by pressing '/' key and input whatever..)
> 4. return to the hist browser (by pressing 'q' or left arrow key)
> 5. open annotation window for the same entry (by pressing 'a' key)
Thanks, nice fix, description and reproduction steps, applied to perf/urgent.
- Arnaldo
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>
> ---
> tools/perf/util/annotate.h | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
> index 0784a9420528..cadbdc90a5cb 100644
> --- a/tools/perf/util/annotate.h
> +++ b/tools/perf/util/annotate.h
> @@ -116,11 +116,6 @@ struct annotation {
> struct annotated_source *src;
> };
>
> -struct sannotation {
> - struct annotation annotation;
> - struct symbol symbol;
> -};
> -
> static inline struct sym_hist *annotation__histogram(struct annotation
> *notes, int idx)
> {
> return (((void *)¬es->src->histograms) +
> @@ -129,8 +124,7 @@ static inline struct sym_hist
> *annotation__histogram(struct annotation *notes, i
>
> static inline struct annotation *symbol__annotation(struct symbol *sym)
> {
> - struct sannotation *a = container_of(sym, struct sannotation, symbol);
> - return &a->annotation;
> + return (void *)sym - symbol_conf.priv_size;
> }
>
> int addr_map_symbol__inc_samples(struct addr_map_symbol *ams, int evidx);
> --
> 2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
