RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-04-21 22:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

kpatch-build: use readelf instead of eu-readelf

Browse Source 
readelf is more standard, using readelf insteaded we should solve there
issues:

First, using "readelf -s", the symbol name would truncated by 25 chars,
to solve this issue, add option "--wide".

Second, the size may be mixed of decimal and hex, we get the size by "%s",
and use strtoul(size, NULL, 0) to convert the size.

Third, the symbol type is SHN_UNDE, the Ndx display "UND", so changed to
compare with "UND".

Signed-off-by: chenzefeng <chenzefeng2@huawei.com>
This commit is contained in:
chenzefeng 2019-05-28 20:21:22 +08:00
parent 7aa371aa37
commit 767d9669bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kpatch-build/kpatch-build
View File

@ -845,7 +845,7 @@ for i in $FILES; do
SYMVERS_FILE="$SRCDIR/Module.symvers" SYMVERS_FILE="$SRCDIR/Module.symvers"
fi fi
eu-readelf -s "$KOBJFILE_PATH" > "$SYMTAB" readelf -s --wide "$KOBJFILE_PATH" > "$SYMTAB"
# create-diff-object orig.o patched.o parent-name parent-symtab # create-diff-object orig.o patched.o parent-name parent-symtab
# Module.symvers patch-mod-name output.o # Module.symvers patch-mod-name output.o

18
kpatch-build/lookup.c
View File

@ -200,17 +200,17 @@ static char *make_modname(char *modname)
static void symtab_read(struct lookup_table *table, char *path) static void symtab_read(struct lookup_table *table, char *path)
{ {
FILE *file; FILE *file;
long unsigned int value, size; long unsigned int value;
unsigned int i = 0; unsigned int i = 0;
int matched; int matched;
char line[256], name[256], type[16], bind[16], ndx[16]; char line[256], name[256], size[16], type[16], bind[16], ndx[16];
if ((file = fopen(path, "r")) == NULL) if ((file = fopen(path, "r")) == NULL)
ERROR("fopen"); ERROR("fopen");
while (fgets(line, 256, file)) { while (fgets(line, 256, file)) {
matched = sscanf(line, "%*s %lx %lu %s %s %*s %s %s\n", matched = sscanf(line, "%*s %lx %s %s %s %*s %s %s\n",
&value, &size, type, bind, ndx, name); &value, size, type, bind, ndx, name);
if (matched == 5) { if (matched == 5) {
name[0] = '\0'; name[0] = '\0';
@ -218,7 +218,7 @@ static void symtab_read(struct lookup_table *table, char *path)
} }
if (matched != 6 || if (matched != 6 ||
!strcmp(ndx, "UNDEF") || !strcmp(ndx, "UND") ||
!strcmp(type, "SECTION")) !strcmp(type, "SECTION"))
continue; continue;
@ -233,8 +233,8 @@ static void symtab_read(struct lookup_table *table, char *path)
rewind(file); rewind(file);
while (fgets(line, 256, file)) { while (fgets(line, 256, file)) {
matched = sscanf(line, "%*s %lx %lu %s %s %*s %s %s\n", matched = sscanf(line, "%*s %lx %s %s %s %*s %s %s\n",
&value, &size, type, bind, ndx, name); &value, size, type, bind, ndx, name);
if (matched == 5) { if (matched == 5) {
name[0] = '\0'; name[0] = '\0';
@ -242,12 +242,12 @@ static void symtab_read(struct lookup_table *table, char *path)
} }
if (matched != 6 || if (matched != 6 ||
!strcmp(ndx, "UNDEF") || !strcmp(ndx, "UND") ||
!strcmp(type, "SECTION")) !strcmp(type, "SECTION"))
continue; continue;
table->obj_syms[i].value = value; table->obj_syms[i].value = value;
table->obj_syms[i].size = size; table->obj_syms[i].size = strtoul(size, NULL, 0);
if (!strcmp(bind, "LOCAL")) { if (!strcmp(bind, "LOCAL")) {
table->obj_syms[i].bind = STB_LOCAL; table->obj_syms[i].bind = STB_LOCAL;