RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2024-12-26 23:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

create-diff-object: better error message for dup file+symbol

Browse Source 
Give a slightly better error message for the dup file+symbol issue.
It's still cryptic but it's good enough to at least give us kpatch
developers a better idea about what went wrong.  This would have helped
diagnose issue #633 much more quickly.
This commit is contained in:
Josh Poimboeuf 2016-12-14 14:59:17 -06:00
parent f9cfd80718
commit 20871391d9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1915,7 +1915,7 @@ void kpatch_create_dynamic_rela_sections(struct kpatch_elf *kelf,
struct symbol *strsym;
struct lookup_result result;
struct kpatch_patch_dynrela *dynrelas;
int vmlinux, external;
int vmlinux, external, ret;
vmlinux = !strcmp(objname, "vmlinux");
@ -1967,10 +1967,15 @@ void kpatch_create_dynamic_rela_sections(struct kpatch_elf *kelf,
if (rela->sym->bind == STB_LOCAL) {
/* An unchanged local symbol */
if (lookup_local_symbol(table, rela->sym->name,
hint, &result))
ERROR("lookup_local_symbol %s (%s) needed for %s",
rela->sym->name, hint, sec->base->name);
ret = lookup_local_symbol(table,
rela->sym->name, hint, &result);
if (ret == 2)
ERROR("lookup_local_symbol: ambiguous %s:%s relocation, needed for %s",
hint, rela->sym->name, sec->base->name);
else if (ret)
ERROR("lookup_local_symbol %s:%s needed for %s",
hint, rela->sym->name, sec->base->name);
}
else if (vmlinux) {
/*

2
kpatch-build/lookup.c
View File

@ -174,7 +174,7 @@ int lookup_local_symbol(struct lookup_table *table, char *name, char *hint,
if (match)
/* dup file+symbol, unresolvable ambiguity */
return 1;
return 2;
match = sym;
}
}