Skip to content

Commit

Permalink
livepatch: RCU protect struct klp_func all the time when used in klp_…
Browse files Browse the repository at this point in the history
…ftrace_handler()

func->new_func has been accessed after rcu_read_unlock() in klp_ftrace_handler()
and therefore the access was not protected.

Signed-off-by: Petr Mladek <pmladek@suse.cz>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
pmladek authored and Jiri Kosina committed Feb 22, 2015
1 parent e0b561e commit c4ce0da
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/livepatch/core.c
Expand Up @@ -314,12 +314,12 @@ static void notrace klp_ftrace_handler(unsigned long ip,
rcu_read_lock();
func = list_first_or_null_rcu(&ops->func_stack, struct klp_func,
stack_node);
rcu_read_unlock();

if (WARN_ON_ONCE(!func))
return;
goto unlock;

klp_arch_set_pc(regs, (unsigned long)func->new_func);
unlock:
rcu_read_unlock();
}

static int klp_disable_func(struct klp_func *func)
Expand Down

0 comments on commit c4ce0da

Please sign in to comment.