kbuild: fix modpost when used with O=
PATCH 1/1 kbuild: fix modpost when used with O=
modpost or to be more specific sumversion.c was not behaving correct when used with O= and MODULE_VERSION was used. Previously it failed to use local .h when calculation the md-sum in case of a O= build.
The following patch introduces the following:
- A generic get_next_line()
- Check that the topmost part of the directory matches
- Using strrch when checking for file with suffix .o
- Use NOFAIL for allocations in sumversion
- Avoid memory leak in new_module
The generic get_next_line will pay off when Andreas implmentation of storing symbil addresses in a seperate file is introduced.
Sam
kbuild-fix-modpost.patch
scripts/modpost.c +42 -9
@@ -11,6 +11,7 @@* Usage: modpost vmlinux module1.o module2.o ... */ +#include <ctype.h> #include "modpost.h" /* Are we using CONFIG_MODVERSIONS? */
@@ -44,8 +45,6 @@va_end (arglist); } -#define NOFAIL (ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) -void *do_nofail (void *ptr,const char *file,int line,const char *expr) {if (!ptr) {
@@ -63,21 +62,19 @@ new_module(char *modname) {struct module *mod; -char *p; -size_t len; +char *p, *s; mod =NOFAIL (malloc (sizeof (*mod)));memset (mod,0 ,sizeof (*mod)); p =NOFAIL (strdup (modname)); - len =strlen (p); -/* strip trailing .o */ -if (len >2 && p[len-2 ] =='.' && p[len-1 ] =='o' ) - p[len -2 ] ='\0' ; +if ((s =strrchr (p,'.' )) !=NULL ) +if (strcmp (s,".o" ) ==0 ) + *s ='\0' ;/* add to list */ - mod->name =NOFAIL (strdup (p)); + mod->name = p; mod->next = modules; modules = mod;
@@ -207,6 +204,42 @@if (map ==MAP_FAILED )return NULL ;return map; +} + +/* +Return a copy of the next line in a mmap'ed file. +spaces in the beginning of the line is trimmed away. +Return a pointer to a static buffer. +*/ +char * +get_next_line (unsigned long *pos,void *file,unsigned long size) +{ +static char line[4096 ]; +int skip =1 ; +size_t len =0 ; +char *p = (char *)file + *pos; +char *s = line; + +for (; *pos < size ; (*pos)++) + { +if (skip &&isspace (*p)) { + p++; +continue ; + } + skip =0 ; +if (*p !='\n' && (*pos < size)) { + len++; + *s++ = *p++; +if (len >4095 ) +break ;/* Too long, stop */ + }else { +/* End of string */ + *s ='\0' ; +return line; + } + } +/* End of buffer */ +return NULL ; }void
scripts/modpost.h +4 -0
@@ -53,6 +53,9 @@#endif +#define NOFAIL (ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) +void *do_nofail (void *ptr,const char *file,int line,const char *expr); +struct buffer {char *p;int pos;
@@ -95,4 +98,5 @@ unsigned long modinfo_offset);void *grab_file (const char *filename,unsigned long *size); +char *get_next_line (unsigned long *pos,void *file,unsigned long size);void release_file (void *file,unsigned long size);
scripts/sumversion.c +34 -40
106 lines not on this page · raw message