lkml.org 
[lkml]   [2020]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [RFC PATCH v2 01/13] perf parse-events: Fix comparison of evsel and leader pmu name
    On Fri, Apr 17, 2020 at 06:41:12PM +0800, John Garry wrote:
    > Since we now strdup() the pmu name for the event selector, use strcmp()
    > instead of pointer equality for comparison.
    >
    > Fixes: d4953f7ef1a2 ("perf parse-events: Fix 3 use after frees found with clang ASANutil/parse-events.c")
    > Signed-off-by: John Garry <john.garry@huawei.com>

    I don't ee this change in your branch:
    private-topic-perf-5.6-sys-pmu-events-v2-upstream

    do you have some updated tree?

    thanks,
    jirka

    > ---
    >
    > I am not 100% sure that this is the right fix....
    >
    > tools/perf/util/parse-events.c | 2 +-
    > 1 file changed, 1 insertion(+), 1 deletion(-)
    >
    > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    > index 10107747b361..90ddade1ba23 100644
    > --- a/tools/perf/util/parse-events.c
    > +++ b/tools/perf/util/parse-events.c
    > @@ -1629,7 +1629,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,
    > * event. That can be used to distinguish the leader from
    > * other members, even they have the same event name.
    > */
    > - if ((leader != evsel) && (leader->pmu_name == evsel->pmu_name)) {
    > + if ((leader != evsel) && !strcmp(leader->pmu_name, evsel->pmu_name)) {
    > is_leader = false;
    > continue;
    > }
    > --
    > 2.16.4
    >

    \
     
     \ /
      Last update: 2020-04-27 10:16    [W:4.202 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site