RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-10 15:19:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

multiple .o's combined have gaps in elf data section

Browse Source
This commit is contained in:
Josh Poimboeuf 2013-01-19 01:29:35 -06:00
parent 5fcbb0bdfa
commit 16647ccf89
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kmod/base.c
View File

@ -163,6 +163,11 @@ int kpatch_register(struct module *mod, void *kpatch_relas,
/* FIXME consider change dest/src to loc/val */
/* TODO: ensure dest value is all zeros before touching it, and that it's within the module bounds */
for (i = 0; i < num_relas; i++) {
/* combined .o files have gaps */
if (!relas[i].type && !relas[i].src && !relas[i].dest)
continue;
switch (relas[i].type) {
case R_X86_64_PC32:
loc = (void *)relas[i].dest;
@ -176,8 +181,9 @@ int kpatch_register(struct module *mod, void *kpatch_relas,
break;
default:
printk("unsupported rela type %ld for "
"0x%lx <- 0x%lx\n", relas[i].type,
relas[i].dest, relas[i].src);
"0x%lx <- 0x%lx at index %d\n",
relas[i].type, relas[i].dest,
relas[i].src, i);
ret = -EINVAL;
goto out;
}
@ -201,6 +207,11 @@ int kpatch_register(struct module *mod, void *kpatch_relas,
funcs = kmalloc((num_patches + 1) * sizeof(*funcs), GFP_KERNEL); /*TODO: error handling, free, etc */
for (i = 0; i < num_patches; i++) {
/* combined .o files have gaps */
if (!patches[i].orig && !patches[i].new)
continue;
funcs[i].old_func_addr = patches[i].orig;
funcs[i].new_func_addr = patches[i].new;
funcs[i].mod = mod;