RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-18 18:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #443 from jpoimboe/func-special-static

Browse Source 
static local fixes
This commit is contained in:
Seth Jennings 2014-10-06 11:33:31 -05:00
commit 78b4d3c70d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,8 +314,7 @@ void kpatch_create_rela_list(struct kpatch_elf *kelf, struct section *sec)
if (!rela->sym) if (!rela->sym)
ERROR("could not find rela entry symbol\n"); ERROR("could not find rela entry symbol\n");
if (rela->sym->sec && if (rela->sym->sec &&
((rela->sym->sec->sh.sh_flags & SHF_STRINGS) || (rela->sym->sec->sh.sh_flags & SHF_STRINGS)) {
!strncmp(rela->sym->name, ".rodata.__func__.", 17))) {
rela->string = rela->sym->sec->data->d_buf + rela->addend; rela->string = rela->sym->sec->data->d_buf + rela->addend;
if (!rela->string) if (!rela->string)
ERROR("could not lookup rela string for %s+%d", ERROR("could not lookup rela string for %s+%d",
@ -537,12 +536,18 @@ char *special_static_prefix(struct symbol *sym)
if (!strncmp(sym->name, "descriptor.", 11)) if (!strncmp(sym->name, "descriptor.", 11))
return "descriptor."; return "descriptor.";
if (!strncmp(sym->name, "__func__.", 9))
return "__func__.";
} }
if (sym->type == STT_SECTION) { if (sym->type == STT_SECTION) {
if (!strncmp(sym->name, ".bss.__key.", 11)) if (!strncmp(sym->name, ".bss.__key.", 11))
return ".bss.__key."; return ".bss.__key.";
if (!strncmp(sym->name, ".rodata.__func__.", 17))
return ".rodata.__func__.";
/* __verbose section contains the descriptor variables */ /* __verbose section contains the descriptor variables */
if (!strcmp(sym->name, "__verbose")) if (!strcmp(sym->name, "__verbose"))
return sym->name; return sym->name;
@ -953,15 +958,11 @@ void kpatch_correlate_static_local_variables(struct kpatch_elf *base,
continue; continue;
/* /*
* __func__'s are special gcc static variables which contain * Find the first function which uses the static variable.
* the function name. There's no need to correlate them * It's possible for multiple functions to use the same static
* because they're read-only and their comparison is done in * variable if the containing function is inlined, but we only
* rela_equal() by comparing the literal strings. * need to find one of them to do the correlation.
*/ */
if (!kpatch_mangled_strcmp(sym->name, "__func__.1"))
continue;
/* find the patched function which uses the static variable */
sec = NULL; sec = NULL;
list_for_each_entry(tmpsec, &patched->sections, list) { list_for_each_entry(tmpsec, &patched->sections, list) {
if (!is_rela_section(tmpsec) || if (!is_rela_section(tmpsec) ||
@ -971,13 +972,11 @@ void kpatch_correlate_static_local_variables(struct kpatch_elf *base,
list_for_each_entry(rela, &tmpsec->relas, list) { list_for_each_entry(rela, &tmpsec->relas, list) {
if (rela->sym != sym) if (rela->sym != sym)
continue; continue;
if (sec)
ERROR("static local variable %s used by two functions",
sym->name);
sec = tmpsec; sec = tmpsec;
break; goto done;
} }
} }
done:
if (!sec) if (!sec)
ERROR("static local variable %s not used", sym->name); ERROR("static local variable %s not used", sym->name);