UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

livepatch: __klp_disable_patch() should never be called for disabled patches 

__klp_disable_patch() should never be called when the patch is not
enabled. Let's add the same warning that we have in __klp_enable_patch().

This allows to remove the check when calling klp_pre_unpatch_callback().
It was strange anyway because it repeatedly checked per-patch flag
for each patched object.

Signed-off-by: Petr Mladek <pmladek@suse.com>
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Petr Mladek 2017-10-20 16:56:51 +02:00 committed by Jiri Kosina
parent 5aaf1ab553
commit 89a9a1c1c8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/livepatch/core.c
View File

@ -282,6 +282,9 @@ static int __klp_disable_patch(struct klp_patch *patch)
{ {
struct klp_object *obj; struct klp_object *obj;
if (WARN_ON(!patch->enabled))
return -EINVAL;
if (klp_transition_patch) if (klp_transition_patch)
return -EBUSY; return -EBUSY;
@ -293,7 +296,7 @@ static int __klp_disable_patch(struct klp_patch *patch)
klp_init_transition(patch, KLP_UNPATCHED); klp_init_transition(patch, KLP_UNPATCHED);
klp_for_each_object(patch, obj) klp_for_each_object(patch, obj)
if (patch->enabled && obj->patched) if (obj->patched)
klp_pre_unpatch_callback(obj); klp_pre_unpatch_callback(obj);
/* /*