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

Make symvers reading code more flexible.

Browse Source 
Kernel commit cb9b55d21fe0 modpost: add support for symbol namespaces
adds a new namespace column to Module.symvers file which can be blank.
fscanf is no longer a viable solution to parse that. Switch to the way
scripts/mod/modpost.c handles this and try to support both versions with
and without namespace column.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
This commit is contained in:
Artem Savkov 2019-10-23 15:33:01 +02:00
parent df5730076f
commit 3a1a73f08c
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kpatch-build/lookup.c
View File

@ -280,18 +280,24 @@ static void symtab_read(struct lookup_table *table, char *path)
fclose(file);
}
/*
* Symvers file format is the following for kernels v5.3 and newer:
* <CRC> <Symbol> <Namespace> <Module> <Export Type>
*
* Separated by tabs. <Namespace> can be blank (i.e. ""). Kernels before v5.3
* don't have namespace column at all.
*/
static void symvers_read(struct lookup_table *table, char *path)
{
FILE *file;
unsigned int crc, i = 0;
char name[256], mod[256], export[256];
unsigned int i = 0;
char line[4096];
char *objname, *symname;
if ((file = fopen(path, "r")) == NULL)
ERROR("fopen");
while (fscanf(file, "%x %s %s %s\n",
&crc, name, mod, export) != EOF)
while (fgets(line, 4096, file))
table->exp_nr++;
table->exp_syms = malloc(table->exp_nr * sizeof(*table->exp_syms));
@ -302,8 +308,31 @@ static void symvers_read(struct lookup_table *table, char *path)
rewind(file);
while (fscanf(file, "%x %s %s %s\n",
&crc, name, mod, export) != EOF) {
while (fgets(line, 4096, file)) {
char *name, *namespace, *mod, *tmp;
if (!(name = strchr(line, '\t')))
continue;
*name++ = '\0';
if (!(namespace = strchr(name, '\t')))
continue;
*namespace++ = '\0';
if (!(mod = strchr(namespace, '\t')))
continue;
*mod++ = '\0';
if ((tmp = strchr(mod, '\t')) != NULL) {
*tmp++ = '\0';
} else {
/*
* Looks like it's an old symvers file with no
* namespace column.
*/
mod = namespace;
}
symname = strdup(name);
if (!symname)
perror("strdup");