lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/5] tools lib traceevent: Do not link broken field arg for an old ftrace event
    Date
    From: Namhyung Kim <namhyung.kim@lge.com>

    Defer linking a newly allocated arg to print_fmt.args until
    all of its field is setup so that later access to ->field.name
    cannot be NULL.

    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/n/tip-7zlkindw0qqqe5h117u59ood@git.kernel.org
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/lib/traceevent/event-parse.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
    index 4f667fdc5fae..ae172e2ee958 100644
    --- a/tools/lib/traceevent/event-parse.c
    +++ b/tools/lib/traceevent/event-parse.c
    @@ -4658,20 +4658,20 @@ int pevent_parse_event(struct pevent *pevent,
    struct print_arg *arg, **list;

    /* old ftrace had no args */
    -
    list = &event->print_fmt.args;
    for (field = event->format.fields; field; field = field->next) {
    arg = alloc_arg();
    - *list = arg;
    - list = &arg->next;
    arg->type = PRINT_FIELD;
    arg->field.name = strdup(field->name);
    if (!arg->field.name) {
    do_warning("failed to allocate field name");
    event->flags |= EVENT_FL_FAILED;
    + free_arg(arg);
    return -1;
    }
    arg->field.field = field;
    + *list = arg;
    + list = &arg->next;
    }
    return 0;
    }
    --
    1.7.10.2


    \
     
     \ /
      Last update: 2012-06-18 05:41    [W:0.037 / U:31.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site