From c40030536defb073a537064ef68bf84786d49f54 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sat, 8 Aug 2009 10:49:09 -0500 Subject: [PATCH] --- yaml --- r: 156569 b: refs/heads/master c: 96b2de313b1e0e02aea80ee47df6a2b5cbdf8e13 h: refs/heads/master i: 156567: 57351d8174a81056f6ef3c59439724e7c9b3577e v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events_filter.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eedf22961060..c6b5ec8098ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3f02212d6a457267e0c9c02c426151c436d9d4 +refs/heads/master: 96b2de313b1e0e02aea80ee47df6a2b5cbdf8e13 diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c index 936c621bbf46..1557148be34b 100644 --- a/trunk/kernel/trace/trace_events_filter.c +++ b/trunk/kernel/trace/trace_events_filter.c @@ -1029,6 +1029,8 @@ static int replace_preds(struct event_subsystem *system, if (elt->op == OP_AND || elt->op == OP_OR) { pred = create_logical_pred(elt->op); + if (!pred) + return -ENOMEM; if (call) { err = filter_add_pred(ps, call, pred); filter_free_pred(pred); @@ -1048,6 +1050,8 @@ static int replace_preds(struct event_subsystem *system, } pred = create_pred(elt->op, operand1, operand2); + if (!pred) + return -ENOMEM; if (call) { err = filter_add_pred(ps, call, pred); filter_free_pred(pred);