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

use kpatch_mangled_strcmp in rela_equal 

Use kpatch_mangled_strcmp() to compare the prefixes of special static
locals.
This commit is contained in:
Josh Poimboeuf 2014-10-06 16:42:54 -05:00
parent 050d7933d7
commit 0e8f1ae02d
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,10 +556,32 @@ char *special_static_prefix(struct symbol *sym)
return NULL;
}
/*
* This is like strcmp, but for gcc-mangled symbols. It skips the comparison
* of any substring which consists of '.' followed by any number of digits.
*/
static int kpatch_mangled_strcmp(char *s1, char *s2)
{
while (*s1 == *s2) {
if (!*s1)
return 0;
if (*s1 == '.' && isdigit(s1[1])) {
if (!isdigit(s2[1]))
return 1;
while (isdigit(*++s1))
;
while (isdigit(*++s2))
;
} else {
s1++;
s2++;
}
}
return 1;
}
int rela_equal(struct rela *rela1, struct rela *rela2)
{
char *prefix1, *prefix2;
if (rela1->type != rela2->type ||
rela1->offset != rela2->offset)
return 0;
@ -570,13 +592,9 @@ int rela_equal(struct rela *rela1, struct rela *rela2)
if (rela1->addend != rela2->addend)
return 0;
prefix1 = special_static_prefix(rela1->sym);
if (prefix1) {
prefix2 = special_static_prefix(rela2->sym);
if (!prefix2)
return 0;
return !strcmp(prefix1, prefix2);
}
if (special_static_prefix(rela1->sym))
return !kpatch_mangled_strcmp(rela1->sym->name,
rela2->sym->name);
return !strcmp(rela1->sym->name, rela2->sym->name);
}
@ -832,30 +850,6 @@ void kpatch_mark_grouped_sections(struct kpatch_elf *kelf)
}
}
/*
* This is like strcmp, but for gcc-mangled symbols. It skips the comparison
* of any substring which consists of '.' followed by any number of digits.
*/
static int kpatch_mangled_strcmp(char *s1, char *s2)
{
while (*s1 == *s2) {
if (!*s1)
return 0;
if (*s1 == '.' && isdigit(s1[1])) {
if (!isdigit(s2[1]))
return 1;
while (isdigit(*++s1))
;
while (isdigit(*++s2))
;
} else {
s1++;
s2++;
}
}
return 1;
}
/*
* When gcc makes compiler optimizations which affect a function's calling
* interface, it mangles the function's name. For example, sysctl_print_dir is