RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from spartacus06/fixes 

add a few comments and st_value !=0 error
This commit is contained in:
Josh Poimboeuf 2014-03-10 15:13:58 -05:00
parent 43e1f18141 e8fb5b1c9f
commit 9e69a53206
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kpatch-build/create-diff-object.c
View File

@ -375,10 +375,19 @@ void kpatch_create_symbol_table(struct kpatch_elf *kelf)
ERROR("couldn't find section for symbol %s\n", ERROR("couldn't find section for symbol %s\n",
sym->name); sym->name);
/*
* __ksymtab_strings is a special case where the
* compiler creates FUNC/OBJECT syms that refer
* to offsets inside the __ksymtab_strings section
* for kernel exported symbols. We want to ignore
* those.
*/
if ((sym->type == STT_FUNC || if ((sym->type == STT_FUNC ||
sym->type == STT_OBJECT) && sym->type == STT_OBJECT) &&
sym->sym.st_value == 0 &&
strcmp(sym->sec->name, "__ksymtab_strings")) { strcmp(sym->sec->name, "__ksymtab_strings")) {
if (sym->sym.st_value != 0)
ERROR("symbol %s at offset %lu within section %s, expected 0",
sym->name, sym->sym.st_value, sym->sec->name);
sym->sec->sym = sym; sym->sec->sym = sym;
} else if (sym->type == STT_SECTION) { } else if (sym->type == STT_SECTION) {
sym->sec->secsym = sym; sym->sec->secsym = sym;
@ -890,8 +899,8 @@ void kpatch_generate_output(struct kpatch_elf *kelf, struct kpatch_elf **kelfout
} }
/* /*
* Search symbol table for local functions whose sections are * Search symbol table for local functions and objects whose sections
* not included, and modify them to be non-local. * are not included, and modify them to be non-local.
*/ */
for_each_symbol(i, sym, &kelf->symbols) { for_each_symbol(i, sym, &kelf->symbols) {
if (i == 0) if (i == 0)