diff mbox series

HID: surface-hid: Fix integer endian conversion

Message ID 20210411113402.2594945-1-luzmaximilian@gmail.com (mailing list archive)
State Mainlined
Commit b0d713c60c75cdd04bf8ad8cfb046c8530709de3
Delegated to: Jiri Kosina
Headers show
Series HID: surface-hid: Fix integer endian conversion | expand

Commit Message

Maximilian Luz April 11, 2021, 11:34 a.m. UTC
We want to convert from 16 bit (unsigned) little endian values contained
in a packed struct to CPU native endian values here, not the other way
around. So replace cpu_to_le16() with get_unaligned_le16(), using the
latter instead of le16_to_cpu() to acknowledge that we are reading from
a packed struct.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: b05ff1002a5c ("HID: Add support for Surface Aggregator Module HID transport")
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
---
 drivers/hid/surface-hid/surface_hid_core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Maximilian Luz April 30, 2021, 6:01 p.m. UTC | #1
On 4/11/21 1:34 PM, Maximilian Luz wrote:
> We want to convert from 16 bit (unsigned) little endian values contained
> in a packed struct to CPU native endian values here, not the other way
> around. So replace cpu_to_le16() with get_unaligned_le16(), using the
> latter instead of le16_to_cpu() to acknowledge that we are reading from
> a packed struct.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: b05ff1002a5c ("HID: Add support for Surface Aggregator Module HID transport")
> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>

Friendly ping as it seems this hasn't made it into the PR for v5.13 :)

Regards,
Max
Jiri Kosina May 5, 2021, 12:32 p.m. UTC | #2
On Sun, 11 Apr 2021, Maximilian Luz wrote:

> We want to convert from 16 bit (unsigned) little endian values contained
> in a packed struct to CPU native endian values here, not the other way
> around. So replace cpu_to_le16() with get_unaligned_le16(), using the
> latter instead of le16_to_cpu() to acknowledge that we are reading from
> a packed struct.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: b05ff1002a5c ("HID: Add support for Surface Aggregator Module HID transport")
> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>

Applied to hid.git#for-5.13/upstream-fixes. Thanks,
diff mbox series

Patch

diff --git a/drivers/hid/surface-hid/surface_hid_core.c b/drivers/hid/surface-hid/surface_hid_core.c
index 7b27ec392232..5571e74abe91 100644
--- a/drivers/hid/surface-hid/surface_hid_core.c
+++ b/drivers/hid/surface-hid/surface_hid_core.c
@@ -168,9 +168,9 @@  int surface_hid_device_add(struct surface_hid_device *shid)
 
 	shid->hid->dev.parent = shid->dev;
 	shid->hid->bus = BUS_HOST;
-	shid->hid->vendor = cpu_to_le16(shid->attrs.vendor);
-	shid->hid->product = cpu_to_le16(shid->attrs.product);
-	shid->hid->version = cpu_to_le16(shid->hid_desc.hid_version);
+	shid->hid->vendor = get_unaligned_le16(&shid->attrs.vendor);
+	shid->hid->product = get_unaligned_le16(&shid->attrs.product);
+	shid->hid->version = get_unaligned_le16(&shid->hid_desc.hid_version);
 	shid->hid->country = shid->hid_desc.country_code;
 
 	snprintf(shid->hid->name, sizeof(shid->hid->name), "Microsoft Surface %04X:%04X",