tracing/filters: add missing unlock in a failure path
PATCH 1/2 tracing/filters: add missing unlock in a failure path
[ Impact: fix deadlock in a rare case we fail to allocate memory ]
Signed-off-by Li Zefan <[email protected]>
--- kernel/trace/trace_events_filter.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
kernel/trace/trace_events_filter.c +6 -4
@@ -1079,9 +1079,10 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)return 0 ; } + err = -ENOMEM ; ps =kzalloc (sizeof (*ps),GFP_KERNEL );if (!ps) -return -ENOMEM ; + goto out_unlock;filter_disable_preds (call);replace_filter_string (call->filter, filter_string);
@@ -1101,7 +1102,7 @@ out:filter_opstack_clear (ps);postfix_clear (ps);kfree (ps); - +out_unlock:mutex_unlock (&filter_mutex);return err;
@@ -1123,9 +1124,10 @@ int apply_subsystem_event_filter(struct event_subsystem *system,return 0 ; } + err = -ENOMEM ; ps =kzalloc (sizeof (*ps),GFP_KERNEL );if (!ps) -return -ENOMEM ; + goto out_unlock;filter_free_subsystem_preds (system);replace_filter_string (system->filter, filter_string);
@@ -1145,7 +1147,7 @@ out:filter_opstack_clear (ps);postfix_clear (ps);kfree (ps); - +out_unlock:mutex_unlock (&filter_mutex);return err;
Signature · 1 line
1.5.4.rc3
PATCH 2/2 tracing/filters: fix off-by-one bug
We should leave the last slot for the ending '\0'.
[ Impact: fix possible crash when the length of an operand is 128 ]
Signed-off-by Li Zefan <[email protected]>
--- kernel/trace/trace_events_filter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_events_filter.c +1 -1
@@ -736,7 +736,7 @@ static inline void clear_operand_string(struct filter_parse_state *ps)static inline int append_operand_char (struct filter_parse_state *ps,char c) { -if (ps->operand.tail ==MAX_FILTER_STR_VAL ) +if (ps->operand.tail ==MAX_FILTER_STR_VAL -1 )return -EINVAL ; ps->operand.string[ps->operand.tail++] = c;
Signature · 1 line
1.5.4.rc3
Commit-ID: 8cd995b6deedf98b7694ed32a786ee7f793d1eec Gitweb: http://git.kernel.org/tip/8cd995b6deedf98b7694ed32a786ee7f793d1eec Author: Li Zefan <[email protected]> AuthorDate: Fri, 15 May 2009 11:07:27 +0800 Committer: Steven Rostedt <[email protected]> CommitDate: Thu, 14 May 2009 23:55:10 -0400
tracing/filters: add missing unlock in a failure path
[ Impact: fix deadlock in a rare case we fail to allocate memory ]
Signed-off-by Li Zefan <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Steven Rostedt <[email protected]>
--- kernel/trace/trace_events_filter.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
kernel/trace/trace_events_filter.c +6 -4
@@ -1079,9 +1079,10 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)return 0 ; } + err = -ENOMEM ; ps =kzalloc (sizeof (*ps),GFP_KERNEL );if (!ps) -return -ENOMEM ; + goto out_unlock;filter_disable_preds (call);replace_filter_string (call->filter, filter_string);
@@ -1101,7 +1102,7 @@ out:filter_opstack_clear (ps);postfix_clear (ps);kfree (ps); - +out_unlock:mutex_unlock (&filter_mutex);return err;
@@ -1123,9 +1124,10 @@ int apply_subsystem_event_filter(struct event_subsystem *system,return 0 ; } + err = -ENOMEM ; ps =kzalloc (sizeof (*ps),GFP_KERNEL );if (!ps) -return -ENOMEM ; + goto out_unlock;filter_free_subsystem_preds (system);replace_filter_string (system->filter, filter_string);
@@ -1145,7 +1147,7 @@ out:filter_opstack_clear (ps);postfix_clear (ps);kfree (ps); - +out_unlock:mutex_unlock (&filter_mutex);return err;
[tip:tracing/core] tracing/filters: fix off-by-one bug
In reply to Li ZefanCommit-ID: 5872144f64b34a5942f6b4acedc90b02de72c58b Gitweb: http://git.kernel.org/tip/5872144f64b34a5942f6b4acedc90b02de72c58b Author: Li Zefan <[email protected]> AuthorDate: Fri, 15 May 2009 11:07:56 +0800 Committer: Steven Rostedt <[email protected]> CommitDate: Thu, 14 May 2009 23:55:12 -0400
tracing/filters: fix off-by-one bug
We should leave the last slot for the ending '\0'.
[ Impact: fix possible crash when the length of an operand is 128 ]
Signed-off-by Li Zefan <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Steven Rostedt <[email protected]>
--- kernel/trace/trace_events_filter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_events_filter.c +1 -1
@@ -736,7 +736,7 @@ static inline void clear_operand_string(struct filter_parse_state *ps)static inline int append_operand_char (struct filter_parse_state *ps,char c) { -if (ps->operand.tail ==MAX_FILTER_STR_VAL ) +if (ps->operand.tail ==MAX_FILTER_STR_VAL -1 )return -EINVAL ; ps->operand.string[ps->operand.tail++] = c;