RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2024-12-24 22:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

review fixups

Browse Source 
Signed-off-by: Seth Jennings <sjenning@redhat.com>
This commit is contained in:
Seth Jennings 2015-01-22 10:35:11 -06:00
parent f1903de1eb
commit 923d36ffbc
1 changed files with 10 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
kmod/patch/livepatch-patch-hook.c
View File

@ -90,8 +90,10 @@ static int patch_add_func_to_object(struct kpatch_patch_func *kfunc)
func->kfunc = kfunc; func->kfunc = kfunc;
object = patch_find_object_by_name(kfunc->objname); object = patch_find_object_by_name(kfunc->objname);
if (!object) if (!object) {
kfree(func);
return -ENOMEM; return -ENOMEM;
}
list_add(&func->list, &object->funcs); list_add(&func->list, &object->funcs);
object->funcs_nr++; object->funcs_nr++;
return 0; return 0;
@ -109,8 +111,10 @@ static int patch_add_reloc_to_object(struct kpatch_patch_dynrela *dynrela)
reloc->kdynrela = dynrela; reloc->kdynrela = dynrela;
object = patch_find_object_by_name(dynrela->objname); object = patch_find_object_by_name(dynrela->objname);
if (!object) if (!object) {
kfree(reloc);
return -ENOMEM; return -ENOMEM;
}
list_add(&reloc->list, &object->relocs); list_add(&reloc->list, &object->relocs);
object->relocs_nr++; object->relocs_nr++;
return 0; return 0;
@ -142,13 +146,11 @@ static void patch_free_livepatch(struct klp_patch *patch)
struct klp_object *object; struct klp_object *object;
if (patch) { if (patch) {
object = patch->objs; for (object = patch->objs; object && object->funcs; object++) {
while (object && object->funcs) {
if (object->funcs) if (object->funcs)
kfree(object->funcs); kfree(object->funcs);
if (object->relocs) if (object->relocs)
kfree(object->relocs); kfree(object->relocs);
object++;
} }
if (patch->objs) if (patch->objs)
kfree(patch->objs); kfree(patch->objs);
@ -156,52 +158,6 @@ static void patch_free_livepatch(struct klp_patch *patch)
} }
} }
/* debug */
#if 0
static void print_object(struct klp_object *object)
{
pr_info("object '%s':\n", (object->name) ? object->name : "vmlinux");
}
static void print_func(struct klp_func *func)
{
pr_info(" func: '%s' @ 0x%016lx, new @ 0x%016lx\n",
func->old_name, func->old_addr,
(unsigned long)func->new_func);
}
static void print_reloc(struct klp_reloc *reloc)
{
pr_info(" reloc: sym '%s', dest 0x%016lx, src 0x%016lx\n",
reloc->name, reloc->loc, reloc->val);
}
static void print_livepatch(struct klp_patch *patch)
{
struct klp_object *object;
struct klp_func *func;
struct klp_reloc *reloc;
if (patch) {
object = patch->objs;
while (object && object->funcs) {
print_object(object);
func = object->funcs;
while (func && func->old_name) {
print_func(func);
func++;
}
reloc = object->relocs;
while (reloc && reloc->name) {
print_reloc(reloc);
reloc++;
}
object++;
}
}
}
#endif
extern struct kpatch_patch_func __kpatch_funcs[], __kpatch_funcs_end[]; extern struct kpatch_patch_func __kpatch_funcs[], __kpatch_funcs_end[];
extern struct kpatch_patch_dynrela __kpatch_dynrelas[], __kpatch_dynrelas_end[]; extern struct kpatch_patch_dynrela __kpatch_dynrelas[], __kpatch_dynrelas_end[];
@ -275,7 +231,7 @@ static int __init patch_init(void)
j = 0; j = 0;
list_for_each_entry(reloc, &object->relocs, list) { list_for_each_entry(reloc, &object->relocs, list) {
lreloc = &lrelocs[j]; lreloc = &lrelocs[j];
lreloc->loc = reloc ->kdynrela->dest; lreloc->loc = reloc->kdynrela->dest;
lreloc->val = reloc->kdynrela->src; lreloc->val = reloc->kdynrela->src;
lreloc->type = reloc->kdynrela->type; lreloc->type = reloc->kdynrela->type;
lreloc->name = reloc->kdynrela->name; lreloc->name = reloc->kdynrela->name;
@ -315,7 +271,6 @@ out:
static void __exit patch_exit(void) static void __exit patch_exit(void)
{ {
WARN_ON(klp_disable_patch(patch));
WARN_ON(klp_unregister_patch(patch)); WARN_ON(klp_unregister_patch(patch));
} }