Messages in this thread Patch in this message | | | Date | Tue, 24 Apr 2012 15:33:11 -0700 | From | Greg KH <> | Subject | [ 30/62] Fix modpost failures in fedora 17 |
| |
3.3-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Miller <davem@davemloft.net>
commit e88aa7bbbe3046a125ea1936b16bb921cc9c6349 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- scripts/mod/file2alias.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -1075,6 +1075,10 @@ void handle_moddevtable(struct module *m 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)
| |