openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kbuild: fix segv in modpost 

Parsing an old Modules.symvers file casued modpost to SEGV.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Sam Ravnborg 2006-07-01 10:10:19 +02:00
parent 66392c4f22
commit 534b89a9f6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mod/modpost.c
View File

@ -205,6 +205,8 @@ static const char *export_str(enum export ex)
static enum export export_no(const char * s) static enum export export_no(const char * s)
{ {
int i; int i;
if (!s)
return export_unknown;
for (i = 0; export_list[i].export != export_unknown; i++) { for (i = 0; export_list[i].export != export_unknown; i++) {
if (strcmp(export_list[i].str, s) == 0) if (strcmp(export_list[i].str, s) == 0)
return export_list[i].export; return export_list[i].export;
@ -1271,7 +1273,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
} }
/* parse Module.symvers file. line format: /* parse Module.symvers file. line format:
* 0x12345678<tab>symbol<tab>module[<tab>export] * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something]
**/ **/
static void read_dump(const char *fname, unsigned int kernel) static void read_dump(const char *fname, unsigned int kernel)
{ {
@ -1284,7 +1286,7 @@ static void read_dump(const char *fname, unsigned int kernel)
return; return;
while ((line = get_next_line(&pos, file, size))) { while ((line = get_next_line(&pos, file, size))) {
char *symname, *modname, *d, *export; char *symname, *modname, *d, *export, *end;
unsigned int crc; unsigned int crc;
struct module *mod; struct module *mod;
struct symbol *s; struct symbol *s;
@ -1297,7 +1299,8 @@ static void read_dump(const char *fname, unsigned int kernel)
*modname++ = '\0'; *modname++ = '\0';
if ((export = strchr(modname, '\t')) != NULL) if ((export = strchr(modname, '\t')) != NULL)
*export++ = '\0'; *export++ = '\0';
if (export && ((end = strchr(export, '\t')) != NULL))
*end = '\0';
crc = strtoul(line, &d, 16); crc = strtoul(line, &d, 16);
if (*symname == '\0' || *modname == '\0' || *d != '\0') if (*symname == '\0' || *modname == '\0' || *d != '\0')
goto fail; goto fail;