mirror of
https://github.com/torvalds/linux
synced 2024-09-22 03:55:39 +00:00
Merge branch 'modpost' of git://git.pengutronix.de/git/ukl/linux-2.6 into kbuild/for-next
Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
commit
d224a94ab9
|
@ -781,10 +781,13 @@ static void check_section(const char *modname, struct elf_info *elf,
|
||||||
#define ALL_EXIT_TEXT_SECTIONS \
|
#define ALL_EXIT_TEXT_SECTIONS \
|
||||||
".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
|
".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
|
||||||
|
|
||||||
#define ALL_INIT_SECTIONS INIT_SECTIONS, DEV_INIT_SECTIONS, \
|
#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \
|
||||||
CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
|
MEM_INIT_SECTIONS
|
||||||
#define ALL_EXIT_SECTIONS EXIT_SECTIONS, DEV_EXIT_SECTIONS, \
|
#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
|
||||||
CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
|
MEM_EXIT_SECTIONS
|
||||||
|
|
||||||
|
#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
|
||||||
|
#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
|
||||||
|
|
||||||
#define DATA_SECTIONS ".data$", ".data.rel$"
|
#define DATA_SECTIONS ".data$", ".data.rel$"
|
||||||
#define TEXT_SECTIONS ".text$"
|
#define TEXT_SECTIONS ".text$"
|
||||||
|
@ -814,33 +817,29 @@ static const char *data_sections[] = { DATA_SECTIONS, NULL };
|
||||||
|
|
||||||
|
|
||||||
/* symbols in .data that may refer to init/exit sections */
|
/* symbols in .data that may refer to init/exit sections */
|
||||||
static const char *symbol_white_list[] =
|
#define DEFAULT_SYMBOL_WHITE_LIST \
|
||||||
{
|
"*driver", \
|
||||||
"*driver",
|
"*_template", /* scsi uses *_template a lot */ \
|
||||||
"*_template", /* scsi uses *_template a lot */
|
"*_timer", /* arm uses ops structures named _timer a lot */ \
|
||||||
"*_timer", /* arm uses ops structures named _timer a lot */
|
"*_sht", /* scsi also used *_sht to some extent */ \
|
||||||
"*_sht", /* scsi also used *_sht to some extent */
|
"*_ops", \
|
||||||
"*_ops",
|
"*_probe", \
|
||||||
"*_probe",
|
"*_probe_one", \
|
||||||
"*_probe_one",
|
"*_console"
|
||||||
"*_console",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char *head_sections[] = { ".head.text*", NULL };
|
static const char *head_sections[] = { ".head.text*", NULL };
|
||||||
static const char *linker_symbols[] =
|
static const char *linker_symbols[] =
|
||||||
{ "__init_begin", "_sinittext", "_einittext", NULL };
|
{ "__init_begin", "_sinittext", "_einittext", NULL };
|
||||||
|
|
||||||
enum mismatch {
|
enum mismatch {
|
||||||
NO_MISMATCH,
|
TEXT_TO_ANY_INIT,
|
||||||
TEXT_TO_INIT,
|
DATA_TO_ANY_INIT,
|
||||||
DATA_TO_INIT,
|
TEXT_TO_ANY_EXIT,
|
||||||
TEXT_TO_EXIT,
|
DATA_TO_ANY_EXIT,
|
||||||
DATA_TO_EXIT,
|
XXXINIT_TO_SOME_INIT,
|
||||||
XXXINIT_TO_INIT,
|
XXXEXIT_TO_SOME_EXIT,
|
||||||
XXXEXIT_TO_EXIT,
|
ANY_INIT_TO_ANY_EXIT,
|
||||||
INIT_TO_EXIT,
|
ANY_EXIT_TO_ANY_INIT,
|
||||||
EXIT_TO_INIT,
|
|
||||||
EXPORT_TO_INIT_EXIT,
|
EXPORT_TO_INIT_EXIT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -848,6 +847,7 @@ struct sectioncheck {
|
||||||
const char *fromsec[20];
|
const char *fromsec[20];
|
||||||
const char *tosec[20];
|
const char *tosec[20];
|
||||||
enum mismatch mismatch;
|
enum mismatch mismatch;
|
||||||
|
const char *symbol_white_list[20];
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct sectioncheck sectioncheck[] = {
|
const struct sectioncheck sectioncheck[] = {
|
||||||
|
@ -857,80 +857,103 @@ const struct sectioncheck sectioncheck[] = {
|
||||||
{
|
{
|
||||||
.fromsec = { TEXT_SECTIONS, NULL },
|
.fromsec = { TEXT_SECTIONS, NULL },
|
||||||
.tosec = { ALL_INIT_SECTIONS, NULL },
|
.tosec = { ALL_INIT_SECTIONS, NULL },
|
||||||
.mismatch = TEXT_TO_INIT,
|
.mismatch = TEXT_TO_ANY_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.fromsec = { DATA_SECTIONS, NULL },
|
.fromsec = { DATA_SECTIONS, NULL },
|
||||||
.tosec = { ALL_INIT_SECTIONS, NULL },
|
.tosec = { ALL_XXXINIT_SECTIONS, NULL },
|
||||||
.mismatch = DATA_TO_INIT,
|
.mismatch = DATA_TO_ANY_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.fromsec = { DATA_SECTIONS, NULL },
|
||||||
|
.tosec = { INIT_SECTIONS, NULL },
|
||||||
|
.mismatch = DATA_TO_ANY_INIT,
|
||||||
|
.symbol_white_list = {
|
||||||
|
"*_template", "*_timer", "*_sht", "*_ops",
|
||||||
|
"*_probe", "*_probe_one", "*_console", NULL
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.fromsec = { TEXT_SECTIONS, NULL },
|
.fromsec = { TEXT_SECTIONS, NULL },
|
||||||
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
||||||
.mismatch = TEXT_TO_EXIT,
|
.mismatch = TEXT_TO_ANY_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.fromsec = { DATA_SECTIONS, NULL },
|
.fromsec = { DATA_SECTIONS, NULL },
|
||||||
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
||||||
.mismatch = DATA_TO_EXIT,
|
.mismatch = DATA_TO_ANY_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference init code/data from devinit/cpuinit/meminit code/data */
|
/* Do not reference init code/data from devinit/cpuinit/meminit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, MEM_INIT_SECTIONS, NULL },
|
.fromsec = { ALL_XXXINIT_SECTIONS, NULL },
|
||||||
.tosec = { INIT_SECTIONS, NULL },
|
.tosec = { INIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXINIT_TO_INIT,
|
.mismatch = XXXINIT_TO_SOME_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference cpuinit code/data from meminit code/data */
|
/* Do not reference cpuinit code/data from meminit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { MEM_INIT_SECTIONS, NULL },
|
.fromsec = { MEM_INIT_SECTIONS, NULL },
|
||||||
.tosec = { CPU_INIT_SECTIONS, NULL },
|
.tosec = { CPU_INIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXINIT_TO_INIT,
|
.mismatch = XXXINIT_TO_SOME_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference meminit code/data from cpuinit code/data */
|
/* Do not reference meminit code/data from cpuinit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { CPU_INIT_SECTIONS, NULL },
|
.fromsec = { CPU_INIT_SECTIONS, NULL },
|
||||||
.tosec = { MEM_INIT_SECTIONS, NULL },
|
.tosec = { MEM_INIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXINIT_TO_INIT,
|
.mismatch = XXXINIT_TO_SOME_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
|
/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS, NULL },
|
.fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
|
||||||
.tosec = { EXIT_SECTIONS, NULL },
|
.tosec = { EXIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXEXIT_TO_EXIT,
|
.mismatch = XXXEXIT_TO_SOME_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference cpuexit code/data from memexit code/data */
|
/* Do not reference cpuexit code/data from memexit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { MEM_EXIT_SECTIONS, NULL },
|
.fromsec = { MEM_EXIT_SECTIONS, NULL },
|
||||||
.tosec = { CPU_EXIT_SECTIONS, NULL },
|
.tosec = { CPU_EXIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXEXIT_TO_EXIT,
|
.mismatch = XXXEXIT_TO_SOME_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not reference memexit code/data from cpuexit code/data */
|
/* Do not reference memexit code/data from cpuexit code/data */
|
||||||
{
|
{
|
||||||
.fromsec = { CPU_EXIT_SECTIONS, NULL },
|
.fromsec = { CPU_EXIT_SECTIONS, NULL },
|
||||||
.tosec = { MEM_EXIT_SECTIONS, NULL },
|
.tosec = { MEM_EXIT_SECTIONS, NULL },
|
||||||
.mismatch = XXXEXIT_TO_EXIT,
|
.mismatch = XXXEXIT_TO_SOME_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not use exit code/data from init code */
|
/* Do not use exit code/data from init code */
|
||||||
{
|
{
|
||||||
.fromsec = { ALL_INIT_SECTIONS, NULL },
|
.fromsec = { ALL_INIT_SECTIONS, NULL },
|
||||||
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
.tosec = { ALL_EXIT_SECTIONS, NULL },
|
||||||
.mismatch = INIT_TO_EXIT,
|
.mismatch = ANY_INIT_TO_ANY_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not use init code/data from exit code */
|
/* Do not use init code/data from exit code */
|
||||||
{
|
{
|
||||||
.fromsec = { ALL_EXIT_SECTIONS, NULL },
|
.fromsec = { ALL_EXIT_SECTIONS, NULL },
|
||||||
.tosec = { ALL_INIT_SECTIONS, NULL },
|
.tosec = { ALL_INIT_SECTIONS, NULL },
|
||||||
.mismatch = EXIT_TO_INIT,
|
.mismatch = ANY_EXIT_TO_ANY_INIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
},
|
},
|
||||||
/* Do not export init/exit functions or data */
|
/* Do not export init/exit functions or data */
|
||||||
{
|
{
|
||||||
.fromsec = { "__ksymtab*", NULL },
|
.fromsec = { "__ksymtab*", NULL },
|
||||||
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
|
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
|
||||||
.mismatch = EXPORT_TO_INIT_EXIT
|
.mismatch = EXPORT_TO_INIT_EXIT,
|
||||||
|
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static int section_mismatch(const char *fromsec, const char *tosec)
|
static const struct sectioncheck *section_mismatch(
|
||||||
|
const char *fromsec, const char *tosec)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
|
int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
|
||||||
|
@ -939,10 +962,10 @@ static int section_mismatch(const char *fromsec, const char *tosec)
|
||||||
for (i = 0; i < elems; i++) {
|
for (i = 0; i < elems; i++) {
|
||||||
if (match(fromsec, check->fromsec) &&
|
if (match(fromsec, check->fromsec) &&
|
||||||
match(tosec, check->tosec))
|
match(tosec, check->tosec))
|
||||||
return check->mismatch;
|
return check;
|
||||||
check++;
|
check++;
|
||||||
}
|
}
|
||||||
return NO_MISMATCH;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -961,7 +984,7 @@ static int section_mismatch(const char *fromsec, const char *tosec)
|
||||||
* Pattern 2:
|
* Pattern 2:
|
||||||
* Many drivers utilise a *driver container with references to
|
* Many drivers utilise a *driver container with references to
|
||||||
* add, remove, probe functions etc.
|
* add, remove, probe functions etc.
|
||||||
* These functions may often be marked __init and we do not want to
|
* These functions may often be marked __devinit and we do not want to
|
||||||
* warn here.
|
* warn here.
|
||||||
* the pattern is identified by:
|
* the pattern is identified by:
|
||||||
* tosec = init or exit section
|
* tosec = init or exit section
|
||||||
|
@ -982,7 +1005,8 @@ static int section_mismatch(const char *fromsec, const char *tosec)
|
||||||
* refsymname = __init_begin, _sinittext, _einittext
|
* refsymname = __init_begin, _sinittext, _einittext
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
static int secref_whitelist(const char *fromsec, const char *fromsym,
|
static int secref_whitelist(const struct sectioncheck *mismatch,
|
||||||
|
const char *fromsec, const char *fromsym,
|
||||||
const char *tosec, const char *tosym)
|
const char *tosec, const char *tosym)
|
||||||
{
|
{
|
||||||
/* Check for pattern 1 */
|
/* Check for pattern 1 */
|
||||||
|
@ -994,7 +1018,7 @@ static int secref_whitelist(const char *fromsec, const char *fromsym,
|
||||||
/* Check for pattern 2 */
|
/* Check for pattern 2 */
|
||||||
if (match(tosec, init_exit_sections) &&
|
if (match(tosec, init_exit_sections) &&
|
||||||
match(fromsec, data_sections) &&
|
match(fromsec, data_sections) &&
|
||||||
match(fromsym, symbol_white_list))
|
match(fromsym, mismatch->symbol_white_list))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Check for pattern 3 */
|
/* Check for pattern 3 */
|
||||||
|
@ -1155,7 +1179,8 @@ static int is_function(Elf_Sym *sym)
|
||||||
* Try to find symbols near it so user can find it.
|
* Try to find symbols near it so user can find it.
|
||||||
* Check whitelist before warning - it may be a false positive.
|
* Check whitelist before warning - it may be a false positive.
|
||||||
*/
|
*/
|
||||||
static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
static void report_sec_mismatch(const char *modname,
|
||||||
|
const struct sectioncheck *mismatch,
|
||||||
const char *fromsec,
|
const char *fromsec,
|
||||||
unsigned long long fromaddr,
|
unsigned long long fromaddr,
|
||||||
const char *fromsym,
|
const char *fromsym,
|
||||||
|
@ -1186,8 +1211,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec,
|
modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec,
|
||||||
tosym, to_p);
|
tosym, to_p);
|
||||||
|
|
||||||
switch (mismatch) {
|
switch (mismatch->mismatch) {
|
||||||
case TEXT_TO_INIT:
|
case TEXT_TO_ANY_INIT:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The function %s%s() references\n"
|
"The function %s%s() references\n"
|
||||||
"the %s %s%s%s.\n"
|
"the %s %s%s%s.\n"
|
||||||
|
@ -1197,8 +1222,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
to, sec2annotation(tosec), tosym, to_p,
|
to, sec2annotation(tosec), tosym, to_p,
|
||||||
fromsym, sec2annotation(tosec), tosym);
|
fromsym, sec2annotation(tosec), tosym);
|
||||||
break;
|
break;
|
||||||
case DATA_TO_INIT: {
|
case DATA_TO_ANY_INIT: {
|
||||||
const char **s = symbol_white_list;
|
const char *const *s = mismatch->symbol_white_list;
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The variable %s references\n"
|
"The variable %s references\n"
|
||||||
"the %s %s%s%s\n"
|
"the %s %s%s%s\n"
|
||||||
|
@ -1211,15 +1236,15 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TEXT_TO_EXIT:
|
case TEXT_TO_ANY_EXIT:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The function %s() references a %s in an exit section.\n"
|
"The function %s() references a %s in an exit section.\n"
|
||||||
"Often the %s %s%s has valid usage outside the exit section\n"
|
"Often the %s %s%s has valid usage outside the exit section\n"
|
||||||
"and the fix is to remove the %sannotation of %s.\n",
|
"and the fix is to remove the %sannotation of %s.\n",
|
||||||
fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
|
fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
|
||||||
break;
|
break;
|
||||||
case DATA_TO_EXIT: {
|
case DATA_TO_ANY_EXIT: {
|
||||||
const char **s = symbol_white_list;
|
const char *const *s = mismatch->symbol_white_list;
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The variable %s references\n"
|
"The variable %s references\n"
|
||||||
"the %s %s%s%s\n"
|
"the %s %s%s%s\n"
|
||||||
|
@ -1232,8 +1257,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case XXXINIT_TO_INIT:
|
case XXXINIT_TO_SOME_INIT:
|
||||||
case XXXEXIT_TO_EXIT:
|
case XXXEXIT_TO_SOME_EXIT:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The %s %s%s%s references\n"
|
"The %s %s%s%s references\n"
|
||||||
"a %s %s%s%s.\n"
|
"a %s %s%s%s.\n"
|
||||||
|
@ -1243,7 +1268,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
to, sec2annotation(tosec), tosym, to_p,
|
to, sec2annotation(tosec), tosym, to_p,
|
||||||
tosym, fromsym, tosym);
|
tosym, fromsym, tosym);
|
||||||
break;
|
break;
|
||||||
case INIT_TO_EXIT:
|
case ANY_INIT_TO_ANY_EXIT:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The %s %s%s%s references\n"
|
"The %s %s%s%s references\n"
|
||||||
"a %s %s%s%s.\n"
|
"a %s %s%s%s.\n"
|
||||||
|
@ -1256,7 +1281,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
to, sec2annotation(tosec), tosym, to_p,
|
to, sec2annotation(tosec), tosym, to_p,
|
||||||
sec2annotation(tosec), tosym, to_p);
|
sec2annotation(tosec), tosym, to_p);
|
||||||
break;
|
break;
|
||||||
case EXIT_TO_INIT:
|
case ANY_EXIT_TO_ANY_INIT:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"The %s %s%s%s references\n"
|
"The %s %s%s%s references\n"
|
||||||
"a %s %s%s%s.\n"
|
"a %s %s%s%s.\n"
|
||||||
|
@ -1275,8 +1300,6 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
|
||||||
"Fix this by removing the %sannotation of %s "
|
"Fix this by removing the %sannotation of %s "
|
||||||
"or drop the export.\n",
|
"or drop the export.\n",
|
||||||
tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
|
tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
|
||||||
case NO_MISMATCH:
|
|
||||||
/* To get warnings on missing members */
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
|
@ -1286,11 +1309,11 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
|
||||||
Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
|
Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
|
||||||
{
|
{
|
||||||
const char *tosec;
|
const char *tosec;
|
||||||
enum mismatch mismatch;
|
const struct sectioncheck *mismatch;
|
||||||
|
|
||||||
tosec = sec_name(elf, sym->st_shndx);
|
tosec = sec_name(elf, sym->st_shndx);
|
||||||
mismatch = section_mismatch(fromsec, tosec);
|
mismatch = section_mismatch(fromsec, tosec);
|
||||||
if (mismatch != NO_MISMATCH) {
|
if (mismatch) {
|
||||||
Elf_Sym *to;
|
Elf_Sym *to;
|
||||||
Elf_Sym *from;
|
Elf_Sym *from;
|
||||||
const char *tosym;
|
const char *tosym;
|
||||||
|
@ -1302,7 +1325,8 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
|
||||||
tosym = sym_name(elf, to);
|
tosym = sym_name(elf, to);
|
||||||
|
|
||||||
/* check whitelist - we may ignore it */
|
/* check whitelist - we may ignore it */
|
||||||
if (secref_whitelist(fromsec, fromsym, tosec, tosym)) {
|
if (secref_whitelist(mismatch,
|
||||||
|
fromsec, fromsym, tosec, tosym)) {
|
||||||
report_sec_mismatch(modname, mismatch,
|
report_sec_mismatch(modname, mismatch,
|
||||||
fromsec, r->r_offset, fromsym,
|
fromsec, r->r_offset, fromsym,
|
||||||
is_function(from), tosec, tosym,
|
is_function(from), tosec, tosym,
|
||||||
|
|
Loading…
Reference in a new issue