[PATCH 1/2] trace_events_filter: use rcu_assign_pointer() whensetting ftrace_event_call->filter

From: Tejun Heo
Date: Tue Nov 22 2011 - 20:46:11 EST


ftrace_event_call->filter is sched RCU protected but didn't use
rcu_assign_pointer(). Fix it.

TODO: Add proper __rcu annotation to call->filter and all its users.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
kernel/trace/trace_events_filter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: work/kernel/trace/trace_events_filter.c
===================================================================
--- work.orig/kernel/trace/trace_events_filter.c
+++ work/kernel/trace/trace_events_filter.c
@@ -1686,7 +1686,7 @@ static int replace_system_preds(struct e
* replace the filter for the call.
*/
filter = call->filter;
- call->filter = filter_item->filter;
+ rcu_assign_pointer(call->filter, filter_item->filter);
filter_item->filter = filter;

fail = false;
@@ -1741,7 +1741,7 @@ int apply_event_filter(struct ftrace_eve
filter = call->filter;
if (!filter)
goto out_unlock;
- call->filter = NULL;
+ rcu_assign_pointer(call->filter, NULL);
/* Make sure the filter is not being used */
synchronize_sched();
__free_filter(filter);
@@ -1782,7 +1782,7 @@ out:
* string
*/
tmp = call->filter;
- call->filter = filter;
+ rcu_assign_pointer(call->filter, filter);
if (tmp) {
/* Make sure the call is done with the filter */
synchronize_sched();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/