Skip to contentSkip to conversation

tracing/filters: don't use pred on alloc failure

PATCH In review Tom Zanussi 1 participant 2 messages Aug 8, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 tip.

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(-)
kernel/trace/trace_events_filter.c +2 -0
index 27c2dbe..490337a 100644
@@ -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
Signature · 1 line
1.5.6.3
#1 lore raw

[tip:tracing/core] tracing/filters: Don't use pred on alloc failure

Commit-ID:  fb82ad719831db58e9baa4c67015aae3fe27e7e3
Gitweb:     http://git.kernel.org/tip/fb82ad719831db58e9baa4c67015aae3fe27e7e3
Author:     Tom Zanussi <[email protected]>
AuthorDate: Sat, 8 Aug 2009 10:49:36 -0500
Committer:  Ingo Molnar <[email protected]>
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).

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Li Zefan <[email protected]>

LKML-Reference: <1249746576.6453.30.camel@tropicana>

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(-)
kernel/trace/trace_events_filter.c +2 -0
index 27c2dbe..490337a 100644
@@ -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