mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fixes from Jiri Kosina: "Two tiny fixes for livepatching infrastructure: - extending RCU critical section to cover all accessess to RCU-protected variable, by Petr Mladek - proper format string passing to kobject_init_and_add(), by Jiri Kosina" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: RCU protect struct klp_func all the time when used in klp_ftrace_handler() livepatch: fix format string in kobject_init_and_add()
This commit is contained in:
commit
9ec0de0ee0
1 changed files with 5 additions and 5 deletions
|
@ -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)
|
||||
|
@ -731,7 +731,7 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func)
|
|||
func->state = KLP_DISABLED;
|
||||
|
||||
return kobject_init_and_add(&func->kobj, &klp_ktype_func,
|
||||
obj->kobj, func->old_name);
|
||||
obj->kobj, "%s", func->old_name);
|
||||
}
|
||||
|
||||
/* parts of the initialization that is done only when the object is loaded */
|
||||
|
@ -807,7 +807,7 @@ static int klp_init_patch(struct klp_patch *patch)
|
|||
patch->state = KLP_DISABLED;
|
||||
|
||||
ret = kobject_init_and_add(&patch->kobj, &klp_ktype_patch,
|
||||
klp_root_kobj, patch->mod->name);
|
||||
klp_root_kobj, "%s", patch->mod->name);
|
||||
if (ret)
|
||||
goto unlock;
|
||||
|
||||
|
|
Loading…
Reference in a new issue