[PATCH] Fix modpost failures in fedora 17

[PATCH] Fix modpost failures in fedora 17

[David Miller]

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>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 8e730cc..44ddaa5 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)

Re: [PATCH] Fix modpost failures in fedora 17

[Sam Ravnborg]

On Thu, Apr 12, 2012 at 02:37:30PM -0400, David Miller wrote:
> 
> 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>

I assume this is stable material too?
In other words we should add:
Cc: stable@vger.kernel.org

Michal - I assume you take this.

	Sam

Re: [PATCH] Fix modpost failures in fedora 17

[David Miller]

From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 12 Apr 2012 21:13:04 +0200

> On Thu, Apr 12, 2012 at 02:37:30PM -0400, David Miller wrote:
>> 
>> 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>
> 
> I assume this is stable material too?

Yes.

> In other words we should add:
> Cc: stable@vger.kernel.org

Indeed, we should.

Re: [PATCH] Fix modpost failures in fedora 17

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 12 Apr 2012 14:37:30 -0400 (EDT)

Ping?  Can we get this bug fixed merged some time soon?

> 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>
> 
> diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> index 8e730cc..44ddaa5 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)

Re: [PATCH] Fix modpost failures in fedora 17

[Michal Marek]

Dne 18.4.2012 21:31, David Miller napsal(a):
> From: David Miller <davem@davemloft.net>
> Date: Thu, 12 Apr 2012 14:37:30 -0400 (EDT)
> 
> Ping?  Can we get this bug fixed merged some time soon?

Applied to kbuild.git#rc-fixes now.

Michal

Re: [PATCH] Fix modpost failures in fedora 17

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Wed, 18 Apr 2012 15:31:32 -0400 (EDT)

> Ping?  Can we get this bug fixed merged some time soon?

Come on guys, this should be in Linus's tree and submitted to
all -stable branches by now.  Yet it hasn't been submitted to
any of those places.

What in the world could you possibly be waiting for?

Re: [PATCH] Fix modpost failures in fedora 17

[Sam Ravnborg]

On Sun, Apr 22, 2012 at 12:18:44AM -0400, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 18 Apr 2012 15:31:32 -0400 (EDT)
> 
> > Ping?  Can we get this bug fixed merged some time soon?
> 
> Come on guys, this should be in Linus's tree and submitted to
> all -stable branches by now.  Yet it hasn't been submitted to
> any of those places.
> 
> What in the world could you possibly be waiting for?

Added Michal + kbuild. I do nto handle kbuild patches these days.

	Sam