From 5ba50ef4f1d07f8ef9a9e22f698be505879a0399 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 22 Mar 2009 18:41:59 +0100 Subject: [PATCH] --- yaml --- r: 141012 b: refs/heads/master c: fe9f57f250ab4d781b99504caeb218ca2db14c1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b47261651b48..9e3282f1d729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfb180f3e71b2a280a254c8646a9ab1beab63f84 +refs/heads/master: fe9f57f250ab4d781b99504caeb218ca2db14c1a diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 97d4daaddd9a..594d78aaa185 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -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; }