Commit-ID: fb82ad719831db58e9baa4c67015aae3fe27e7e3 Gitweb: http://git.kernel.org/tip/fb82ad719831db58e9baa4c67015aae3fe27e7e3 Author: Tom Zanussi <tzanussi@xxxxxxxxx> AuthorDate: Sat, 8 Aug 2009 10:49:36 -0500 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Sat, 8 Aug 2009 17:58:07 +0200 tracing/filters: Don't use pred on alloc failure Dan Carpenter sent me a fix to prevent pred from being used if it couldn't be allocated. This updates his patch for the same problem in the tracing tree (which has changed this code quite substantially). Reported-by: Dan Carpenter <error27@xxxxxxxxx> Signed-off-by: Tom Zanussi <tzanussi@xxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Li Zefan <lizf@xxxxxxxxxxxxxx> LKML-Reference: <1249746576.6453.30.camel@tropicana> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> The original report: create_logical_pred() could sometimes return NULL. It's a static checker complaining rather than problems at runtime... --- kernel/trace/trace_events_filter.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 27c2dbe..490337a 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -1050,6 +1050,8 @@ static int replace_preds(struct event_subsystem *system, pred = create_pred(elt->op, operand1, operand2); add_pred: + if (!pred) + return -ENOMEM; if (call) err = filter_add_pred(ps, call, pred, false); else -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html