Patch "modpost: fix ishtp MODULE_DEVICE_TABLE built on big-endian host" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    modpost: fix ishtp MODULE_DEVICE_TABLE built on big-endian host

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     modpost-fix-ishtp-module_device_table-built-on-big-e.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 0d64e02d16cfac965d52f33ae1ffe28d7be39b07
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Date:   Sun Oct 8 02:04:45 2023 +0900

    modpost: fix ishtp MODULE_DEVICE_TABLE built on big-endian host
    
    [ Upstream commit ac96a15a0f0c8812a3aaa587b871cd5527f6d736 ]
    
    When MODULE_DEVICE_TABLE(ishtp, ) is built on a host with a different
    endianness from the target architecture, it results in an incorrect
    MODULE_ALIAS().
    
    For example, see a case where drivers/platform/x86/intel/ishtp_eclite.c
    is built as a module for x86.
    
    If you build it on a little-endian host, you will get the correct
    MODULE_ALIAS:
    
        $ grep MODULE_ALIAS drivers/platform/x86/intel/ishtp_eclite.mod.c
        MODULE_ALIAS("ishtp:{6A19CC4B-D760-4DE3-B14D-F25EBD0FBCD9}");
    
    However, if you build it on a big-endian host, you will get a wrong
    MODULE_ALIAS:
    
        $ grep MODULE_ALIAS drivers/platform/x86/intel/ishtp_eclite.mod.c
        MODULE_ALIAS("ishtp:{BD0FBCD9-F25E-B14D-4DE3-D7606A19CC4B}");
    
    This issue has been unnoticed because the x86 kernel is most likely built
    natively on an x86 host.
    
    The guid field must not be reversed because guid_t is an array of __u8.
    
    Fixes: fa443bc3c1e4 ("HID: intel-ish-hid: add support for MODULE_DEVICE_TABLE()")
    Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
    Reviewed-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
    Tested-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
    Acked-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index ebc3e5a8f797e..39e2c8883ddd4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1401,10 +1401,10 @@ static int do_mhi_ep_entry(const char *filename, void *symval, char *alias)
 /* Looks like: ishtp:{guid} */
 static int do_ishtp_entry(const char *filename, void *symval, char *alias)
 {
-	DEF_FIELD(symval, ishtp_device_id, guid);
+	DEF_FIELD_ADDR(symval, ishtp_device_id, guid);
 
 	strcpy(alias, ISHTP_MODULE_PREFIX "{");
-	add_guid(alias, guid);
+	add_guid(alias, *guid);
 	strcat(alias, "}");
 
 	return 1;