Skip to content

Commit 4e3cd81

Browse files
htejungregkh
authored andcommitted
trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
commit d3d9acf646679c1981032b0985b386d12fccc60c upstream. ftrace_event_call->filter is sched RCU protected but didn't use rcu_assign_pointer(). Use it. TODO: Add proper __rcu annotation to call->filter and all its users. -v2: Use RCU_INIT_POINTER() for %NULL clearing as suggested by Eric. Link: http://lkml.kernel.org/r/20111123164949.GA29639@google.com Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent e006de4 commit 4e3cd81

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/trace/trace_events_filter.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ static int replace_system_preds(struct event_subsystem *system,
17661766
* replace the filter for the call.
17671767
*/
17681768
filter = call->filter;
1769-
call->filter = filter_item->filter;
1769+
rcu_assign_pointer(call->filter, filter_item->filter);
17701770
filter_item->filter = filter;
17711771

17721772
fail = false;
@@ -1821,7 +1821,7 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)
18211821
filter = call->filter;
18221822
if (!filter)
18231823
goto out_unlock;
1824-
call->filter = NULL;
1824+
RCU_INIT_POINTER(call->filter, NULL);
18251825
/* Make sure the filter is not being used */
18261826
synchronize_sched();
18271827
__free_filter(filter);
@@ -1862,7 +1862,7 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)
18621862
* string
18631863
*/
18641864
tmp = call->filter;
1865-
call->filter = filter;
1865+
rcu_assign_pointer(call->filter, filter);
18661866
if (tmp) {
18671867
/* Make sure the call is done with the filter */
18681868
synchronize_sched();

0 commit comments

Comments
 (0)