usb: ehci: fix include/usb/usb.h:'struct usb_configuration' misuse
PATCH 1/2 usb: ehci: fix include/usb/usb.h:'struct usb_configuration' misuse
See the commit
commit 245069bcef15ecc19db616a967501349b76c84d0
Author: Sascha Hauer <[email protected]>
Date: Thu Jul 10 11:36:12 2014 +0200
USB: introduce usb_interface/usb_configuration structs
On little endian systems like ARM the le16_to_cpus() macro is a no op, defined as:
#define le16_to_cpus __le16_to_cpus
#define __le16_to_cpus(x) do {} while (0)So struct usb_configuration field misuse was discovered on big-endian MIPS machine.
--- drivers/usb/core/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/usb.c +1 -1
@@ -191,7 +191,7 @@ static int usb_parse_config(struct usb_device *dev, unsigned char *buffer, int creturn -1 ; }memcpy (&dev->config, buffer, buffer[0 ]); -le16_to_cpus (&(dev->config.wTotalLength)); +le16_to_cpus (&(dev->config.desc.wTotalLength)); dev->config.no_of_if =0 ; index = dev->config.desc.bLength;
Signature · 7 lines
2.5.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 endian: Always evaluate arguments
From: "David S. Miller" <[email protected]>
This patch is based on
commit 3d6f4a20cc287a8980c6186624834cf10a70752b
Author: David Miller <[email protected]>
Date: Thu Jul 24 23:38:31 2008 -0700
endian: Always evaluate arguments.
In barebox.git/drivers/usb/core/usb.c,
function usb_parse_config() we have had
le16_to_cpus(&(dev->config.wTotalLength));
which evaluates to "do { } while (0)" on little endian, so struct usb_configuration field misuse will never be discovered on little endian.
Therefore, always evaluate the arguments to nop endian transformation operations.
--- include/linux/byteorder/big_endian.h | 12 ++++++------ include/linux/byteorder/little_endian.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
include/linux/byteorder/big_endian.h +6 -6
@@ -57,12 +57,12 @@#define __le32_to_cpus (x) __swab32s((x))#define __cpu_to_le16s (x) __swab16s((x))#define __le16_to_cpus (x) __swab16s((x)) -#define __cpu_to_be64s (x) do {} while (0) -#define __be64_to_cpus (x) do {} while (0) -#define __cpu_to_be32s (x) do {} while (0) -#define __be32_to_cpus (x) do {} while (0) -#define __cpu_to_be16s (x) do {} while (0) -#define __be16_to_cpus (x) do {} while (0) +#define __cpu_to_be64s (x) do { (void)(x); } while (0) +#define __be64_to_cpus (x) do { (void)(x); } while (0) +#define __cpu_to_be32s (x) do { (void)(x); } while (0) +#define __be32_to_cpus (x) do { (void)(x); } while (0) +#define __cpu_to_be16s (x) do { (void)(x); } while (0) +#define __be16_to_cpus (x) do { (void)(x); } while (0)#include <linux/byteorder/generic.h>
include/linux/byteorder/little_endian.h +6 -6
@@ -51,12 +51,12 @@#define __be32_to_cpup (x) __swab32p((x))#define __cpu_to_be16p (x) __swab16p((x))#define __be16_to_cpup (x) __swab16p((x)) -#define __cpu_to_le64s (x) do {} while (0) -#define __le64_to_cpus (x) do {} while (0) -#define __cpu_to_le32s (x) do {} while (0) -#define __le32_to_cpus (x) do {} while (0) -#define __cpu_to_le16s (x) do {} while (0) -#define __le16_to_cpus (x) do {} while (0) +#define __cpu_to_le64s (x) do { (void)(x); } while (0) +#define __le64_to_cpus (x) do { (void)(x); } while (0) +#define __cpu_to_le32s (x) do { (void)(x); } while (0) +#define __le32_to_cpus (x) do { (void)(x); } while (0) +#define __cpu_to_le16s (x) do { (void)(x); } while (0) +#define __le16_to_cpus (x) do { (void)(x); } while (0)#define __cpu_to_be64s (x) __swab64s((x))#define __be64_to_cpus (x) __swab64s((x))#define __cpu_to_be32s (x) __swab32s((x))
Signature · 7 lines
2.5.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 11 lines · Antony Pavlov
See the commit
commit
245069bcef15ecc19db616a967501349b76c84d0
Author: Sascha Hauer <[email protected]>
Date: Thu Jul 10 11:36:12 2014 +0200USB: introduce usb_interface/usb_configuration structs
On little endian systems like ARM the
le16_to_cpus()macro is a no op, defined as:
Quoted 7 lines
#define le16_to_cpus __le16_to_cpus #define __le16_to_cpus(x) do {} while (0)So struct
usb_configurationfield misuse was discovered on big-endian MIPS machine.Signed-off-by Antony Pavlov <[email protected]>
Applied, thanks
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox