diff mbox

of: fix autoloading due to broken modalias with no 'compatible'

Message ID 1465231718-2577-1-git-send-email-wsa@the-dreams.de (mailing list archive)
State Accepted
Headers show

Commit Message

Wolfram Sang June 6, 2016, 4:48 p.m. UTC 
Because of an improper dereference, a stray 'C' character was output to
the modalias when no 'compatible' was specified. This is the case for
some old PowerMac drivers which only set the 'name' property. Fix it to
let them match again.

Reported-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Tested-by: Mathieu Malaterre <malat@debian.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Fixes: 6543becf26fff6 ("mod/file2alias: make modalias generation safe for cross compiling")
---

I think it makes sense if this goes in via ppc (with stable tag added).
D'accord?

 scripts/mod/file2alias.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Ellerman June 8, 2016, 11:14 a.m. UTC | #1 
On Mon, 2016-06-06 at 18:48 +0200, Wolfram Sang wrote:
> Because of an improper dereference, a stray 'C' character was output to
> the modalias when no 'compatible' was specified. This is the case for
> some old PowerMac drivers which only set the 'name' property. Fix it to
> let them match again.
> 
> Reported-by: Mathieu Malaterre <malat@debian.org>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> Tested-by: Mathieu Malaterre <malat@debian.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Andreas Schwab <schwab@linux-m68k.org>
> Fixes: 6543becf26fff6 ("mod/file2alias: make modalias generation safe for cross compiling")
> ---
> 
> I think it makes sense if this goes in via ppc (with stable tag added).
> D'accord?

Sure, I've grabbed it.

I added:

    Cc: stable@vger.kernel.org # v3.9+

cheers
Michael Ellerman June 10, 2016, 3:26 a.m. UTC | #2 
On Mon, 2016-06-06 at 16:48:38 UTC, Wolfram Sang wrote:
> Because of an improper dereference, a stray 'C' character was output to
> the modalias when no 'compatible' was specified. This is the case for
> some old PowerMac drivers which only set the 'name' property. Fix it to
> let them match again.
> 
> Reported-by: Mathieu Malaterre <malat@debian.org>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> Tested-by: Mathieu Malaterre <malat@debian.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Andreas Schwab <schwab@linux-m68k.org>
> Fixes: 6543becf26fff6 ("mod/file2alias: make modalias generation safe for cross compiling")

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/b3c0a4dab7e35a9b6d69c04156

cheers
diff mbox

Patch

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a9155077feefb9..fec75786f75bbb 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -384,7 +384,7 @@  static void do_of_entry_multi(void *symval, struct module *mod)
 	len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
 		      (*type)[0] ? *type : "*");
 
-	if (compatible[0])
+	if ((*compatible)[0])
 		sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
 			*compatible);