RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-01 09:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

add deep rela correlation for strings

Browse Source 
Signed-off-by: Seth Jennings <sjenning@redhat.com>
This commit is contained in:
Seth Jennings 2014-02-06 16:16:25 -06:00
parent c1eab7eb7c
commit 588b174ef1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/create-diff-object.c
View File

@ -76,6 +76,7 @@ struct rela {
unsigned char type;
int addend;
int offset;
char *string;
enum status status;
};
@ -218,11 +219,18 @@ void kpatch_create_rela_table(struct kpatch_elf *kelf, struct section *sec)
rela->sym = find_symbol_by_index(&kelf->sybmols, symndx);
if (!rela->sym)
ERROR("could not find rela entry symbol\n");
if (rela->sym->sec && (rela->sym->sec->sh.sh_flags & SHF_STRINGS)) {
rela->string = rela->sym->sec->data->d_buf + rela->addend;
if (!rela->string)
ERROR("could not lookup rela string\n");
}
#if DEBUG
printf("offset %d, type %d, %s %s %d\n", rela->offset,
printf("offset %d, type %d, %s %s %d", rela->offset,
rela->type, rela->sym->name,
(rela->addend < 0)?"-":"+", abs(rela->addend));
if (rela->string)
printf(" (string = %s)", rela->string);
printf("\n");
#endif
}
}
@ -543,7 +551,9 @@ void kpatch_correlate_relas(struct section *sec)
for_each_rela(i, rela1, &sec->relas) {
for_each_rela(j, rela2, &sec->twin->relas) {
if (rela1->type == rela2->type &&
rela1->addend == rela2->addend &&
(rela1->addend == rela2->addend ||
(rela1->string && rela2->string &&
!strcmp(rela1->string, rela2->string))) &&
!strcmp(rela1->sym->name, rela2->sym->name) &&
rela1->offset == rela2->offset) {
rela1->twin = rela2;