Skip to content

Commit ef8daf8

Browse files
joe-lawrenceJiri Kosina
authored andcommitted
livepatch: unpatch all klp_objects if klp_module_coming fails
When an incoming module is considered for livepatching by klp_module_coming(), it iterates over multiple patches and multiple kernel objects in this order: list_for_each_entry(patch, &klp_patches, list) { klp_for_each_object(patch, obj) { which means that if one of the kernel objects fails to patch, klp_module_coming()'s error path needs to unpatch and cleanup any kernel objects that were already patched by a previous patch. Reported-by: Miroslav Benes <[email protected]> Suggested-by: Petr Mladek <[email protected]> Signed-off-by: Joe Lawrence <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent dcba710 commit ef8daf8

File tree

1 file changed

+37
-23
lines changed

1 file changed

+37
-23
lines changed

kernel/livepatch/core.c

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,41 @@ int klp_register_patch(struct klp_patch *patch)
830830
}
831831
EXPORT_SYMBOL_GPL(klp_register_patch);
832832

833+
/*
834+
* Remove parts of patches that touch a given kernel module. The list of
835+
* patches processed might be limited. When limit is NULL, all patches
836+
* will be handled.
837+
*/
838+
static void klp_cleanup_module_patches_limited(struct module *mod,
839+
struct klp_patch *limit)
840+
{
841+
struct klp_patch *patch;
842+
struct klp_object *obj;
843+
844+
list_for_each_entry(patch, &klp_patches, list) {
845+
if (patch == limit)
846+
break;
847+
848+
klp_for_each_object(patch, obj) {
849+
if (!klp_is_module(obj) || strcmp(obj->name, mod->name))
850+
continue;
851+
852+
/*
853+
* Only unpatch the module if the patch is enabled or
854+
* is in transition.
855+
*/
856+
if (patch->enabled || patch == klp_transition_patch) {
857+
pr_notice("reverting patch '%s' on unloading module '%s'\n",
858+
patch->mod->name, obj->mod->name);
859+
klp_unpatch_object(obj);
860+
}
861+
862+
klp_free_object_loaded(obj);
863+
break;
864+
}
865+
}
866+
}
867+
833868
int klp_module_coming(struct module *mod)
834869
{
835870
int ret;
@@ -894,17 +929,14 @@ int klp_module_coming(struct module *mod)
894929
pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n",
895930
patch->mod->name, obj->mod->name, obj->mod->name);
896931
mod->klp_alive = false;
897-
klp_free_object_loaded(obj);
932+
klp_cleanup_module_patches_limited(mod, patch);
898933
mutex_unlock(&klp_mutex);
899934

900935
return ret;
901936
}
902937

903938
void klp_module_going(struct module *mod)
904939
{
905-
struct klp_patch *patch;
906-
struct klp_object *obj;
907-
908940
if (WARN_ON(mod->state != MODULE_STATE_GOING &&
909941
mod->state != MODULE_STATE_COMING))
910942
return;
@@ -917,25 +949,7 @@ void klp_module_going(struct module *mod)
917949
*/
918950
mod->klp_alive = false;
919951

920-
list_for_each_entry(patch, &klp_patches, list) {
921-
klp_for_each_object(patch, obj) {
922-
if (!klp_is_module(obj) || strcmp(obj->name, mod->name))
923-
continue;
924-
925-
/*
926-
* Only unpatch the module if the patch is enabled or
927-
* is in transition.
928-
*/
929-
if (patch->enabled || patch == klp_transition_patch) {
930-
pr_notice("reverting patch '%s' on unloading module '%s'\n",
931-
patch->mod->name, obj->mod->name);
932-
klp_unpatch_object(obj);
933-
}
934-
935-
klp_free_object_loaded(obj);
936-
break;
937-
}
938-
}
952+
klp_cleanup_module_patches_limited(mod, NULL);
939953

940954
mutex_unlock(&klp_mutex);
941955
}

0 commit comments

Comments
 (0)