Commit 89a9a1c1 authored by Petr Mladek's avatar Petr Mladek Committed by Jiri Kosina

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: default avatarPetr Mladek <pmladek@suse.com>
Acked-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5aaf1ab5
...@@ -282,6 +282,9 @@ static int __klp_disable_patch(struct klp_patch *patch) ...@@ -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) ...@@ -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);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment