summaryrefslogtreecommitdiff
path: root/scripts/mod
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2012-04-12 14:37:30 -0400
committerMichal Marek <mmarek@suse.cz>2012-04-18 21:42:07 +0200
commite88aa7bbbe3046a125ea1936b16bb921cc9c6349 (patch)
treee47a298ddb5a2ca5bf3cab5d48beaeea3b40701b /scripts/mod
parent0eb043d0eec44cd083ea6910b1db2f77eb212ebd (diff)
downloadlinux-3.10-e88aa7bbbe3046a125ea1936b16bb921cc9c6349.tar.gz
linux-3.10-e88aa7bbbe3046a125ea1936b16bb921cc9c6349.tar.bz2
linux-3.10-e88aa7bbbe3046a125ea1936b16bb921cc9c6349.zip
Fix modpost failures in fedora 17
The symbol table on x86-64 starts to have entries that have names like: _GLOBAL__sub_I_65535_0___mod_x86cpu_device_table They are of type STT_FUNCTION and this one had a length of 18. This matched the device ID validation logic and it barfed because the length did not meet the device type's criteria. -------------------- FATAL: arch/x86/crypto/aesni-intel: sizeof(struct x86cpu_device_id)=16 is not a modulo of the size of section __mod_x86cpu_device_table=18. Fix definition of struct x86cpu_device_id in mod_devicetable.h -------------------- These are some kind of compiler tool internal stuff being emitted and not something we want to inspect in modpost's device ID table validation code. So skip the symbol if it is not of type STT_OBJECT. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/mod')
-rw-r--r--scripts/mod/file2alias.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 8e730ccc3f2..44ddaa542db 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1100,6 +1100,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
return;
+ /* We're looking for an object */
+ if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
+ return;
+
/* All our symbols are of form <prefix>__mod_XXX_device_table. */
name = strstr(symname, "__mod_");
if (!name)