Tell modpost that any reference from .note* is OK
PATCH 1/1 Tell modpost that any reference from .note* is OK
.note* sections are ELF notes, which are typically used by external tools to examine the kernel image. Since this is removed from any runtime consideration, it's OK to reference any section from a .note* section.
As a side-effect, this changes secref_whitelist to accept a NULL "atsym" pointer, allowing it to be called when "before" is NULL. This is needed for .note sections since they don't necessarily have any symbols, and it also allows the .got2 check to to be folded into the normal whitelist checks.
--- scripts/mod/modpost.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)
===================================================================
scripts/mod/modpost.c +21 -10
@@ -639,6 +639,14 @@ static int strrcmp(const char *s, const* powerpc has a machine desc table for each platform. * It is mixture of function pointers of .init.text and .text. * fromsec = .machvec | .machine.desc +* +* Pattern 11: +* Any reference from an ELF note section (.note*) to another section +* is OK. ELF notes are only used by tools inspecting the actual +* kernel image, so runtime access is not an issue. +* +* Pattern 12: +* powerpc has a GOT table in .got2 section **/ static int secref_whitelist(const char *modname, const char *tosec, const char *fromsec, const char *atsym,
@@ -675,7 +683,7 @@ static int secref_whitelist(const char * f1 =0 ;if (strncmp (fromsec,".data" ,strlen (".data" )) !=0 ) f1 =0 ; -if (strncmp (atsym,"__param" ,strlen ("__param" )) !=0 ) +if (!atsym ||strncmp (atsym,"__param" ,strlen ("__param" )) !=0 ) f1 =0 ;if (f1)
@@ -690,7 +698,7 @@ static int secref_whitelist(const char * f2 =0 ;for (s = pat2sym; *s; s++) -if (strrcmp (atsym, *s) ==0 ) +if (atsym &&strrcmp (atsym, *s) ==0 ) f1 =1 ;if (f1 && f2)return 1 ;
@@ -720,6 +728,14 @@ static int secref_whitelist(const char */* Check for pattern 10 */ if ((strcmp (fromsec,".machvec" ) ==0 ) || (strcmp (fromsec,".machine.desc" ) ==0 )) +return 1 ; + +/* Check for pattern 11 */ +if (strncmp (fromsec,".note" ,strlen (".note" )) ==0 ) +return 1 ; + +/* Check for pattern 12 */ +if (strcmp (fromsec,".got2" ) ==0 )return 1 ;return 0 ;
@@ -848,14 +864,9 @@ static void warn_sec_mismatch(const char refsymname = elf->strtab + refsym->st_name;/* check whitelist - we may ignore it */ -if (before && -secref_whitelist (modname, secname, fromsec, - elf->strtab + before->st_name, refsymname)) -return ; - -/* fromsec whitelist - without a valid 'before' -* powerpc has a GOT table in .got2 section */ -if (strcmp (fromsec,".got2" ) ==0 ) +if (secref_whitelist (modname, secname, fromsec, + before ? (elf->strtab + before->st_name) :NULL , + refsymname))return ;if (before && after) {
Quoted 10 lines · Jeremy Fitzhardinge
.note* sections are ELF notes, which are typically used by external tools to examine the kernel image. Since this is removed from any runtime consideration, it's OK to reference any section from a .note* section.
As a side-effect, this changes
secref_whitelistto accept a NULL "atsym" pointer, allowing it to be called when "before" is NULL. This is needed for .note sections since they don't necessarily have any symbols, and it also allows the .got2 check to to be folded into the normal whitelist checks.
I did it a bit different. Adding .note to init_section_ref_ok + exit_section_ref_ok is much simpler.
Next patch will move .got2 there too.
Sam
scripts/mod/modpost.c +2 -0
@@ -1139,6 +1139,7 @@ static int init_section_ref_ok(const char *name)".debug" ,".parainstructions" ,".rodata" , +".note" ,/* ignore ELF notes - may contain anything */ NULL };/* part of section name */
@@ -1214,6 +1215,7 @@ static int exit_section_ref_ok(const char *name)/* Start of section names */ const char *namelist2[] = {".debug" , +".note" ,/* ignore ELF notes - may contain anything */ NULL };/* part of section name */
Quoted 14 lines · Sam Ravnborg
Quoted 11 lines · Jeremy Fitzhardinge
.note* sections are ELF notes, which are typically used by external tools to examine the kernel image. Since this is removed from any runtime consideration, it's OK to reference any section from a .note* section.
As a side-effect, this changes
secref_whitelistto accept a NULL "atsym" pointer, allowing it to be called when "before" is NULL. This is needed for .note sections since they don't necessarily have any symbols, and it also allows the .got2 check to to be folded into the normal whitelist checks.
Quoted 4 lines
I did it a bit different. Adding .note to
init_section_ref_ok+exit_section_ref_okis much simpler.
Next patch will move .got2 there too.
Oh, yeah, that's simpler. OK.
J