Skip to content

Commit

Permalink
tracing: add run-time field descriptions for event filtering, kfree fix
Browse files Browse the repository at this point in the history
Impact: fix potential kfree of random data in (rare) failure path

Zero-initialize the field structure.

Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <1237710639.7703.46.camel@charm-linux>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Mar 22, 2009
1 parent cfb180f commit fe9f57f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion kernel/trace/trace_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,31 @@ int trace_define_field(struct ftrace_event_call *call, char *type,
{
struct ftrace_event_field *field;

field = kmalloc(sizeof(*field), GFP_KERNEL);
field = kzalloc(sizeof(*field), GFP_KERNEL);
if (!field)
goto err;

field->name = kstrdup(name, GFP_KERNEL);
if (!field->name)
goto err;

field->type = kstrdup(type, GFP_KERNEL);
if (!field->type)
goto err;

field->offset = offset;
field->size = size;
list_add(&field->link, &call->fields);

return 0;

err:
if (field) {
kfree(field->name);
kfree(field->type);
}
kfree(field);

return -ENOMEM;
}

Expand Down

0 comments on commit fe9f57f

Please sign in to comment.