USB: usb gadgets avoid le{16,32}_to_cpup()

It turns out that le16_to_cpup() and le32_to_cpup() aren't always safe
to call with pointers into packed structures, since those are inlined
functions and GCC may lose the "packed" attribute.  So those references
can become unaligned kernel accesses, which are evil on some hardware.

This patch updates uses of those routines in the gadget stack.  The
references into packed structures can just use leXX_to_cpu(*x), which
in most cases is more natural.  Some other uses in RNDIS, mostly in
debug code, were wrong in the first place; those use get_unaligned().

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 188c74a95216..46d0e5252744 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1369,12 +1369,12 @@ config_buf (struct dev_data *dev, u8 type, unsigned index)
                 hs = !hs;
         if (hs) {
                 dev->req->buf = dev->hs_config;
-                len = le16_to_cpup (&dev->hs_config->wTotalLength);
+                len = le16_to_cpu(dev->hs_config->wTotalLength);
         } else
 #endif
         {
                 dev->req->buf = dev->config;
-                len = le16_to_cpup (&dev->config->wTotalLength);
+                len = le16_to_cpu(dev->config->wTotalLength);
         }
         ((u8 *)dev->req->buf) [1] = type;
         return len;
@@ -1885,7 +1885,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 
         /* full or low speed config */
         dev->config = (void *) kbuf;
-        total = le16_to_cpup (&dev->config->wTotalLength);
+        total = le16_to_cpu(dev->config->wTotalLength);
         if (!is_valid_config (dev->config) || total >= length)
                 goto fail;
         kbuf += total;
@@ -1894,7 +1894,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         /* optional high speed config */
         if (kbuf [1] == USB_DT_CONFIG) {
                 dev->hs_config = (void *) kbuf;
-                total = le16_to_cpup (&dev->hs_config->wTotalLength);
+                total = le16_to_cpu(dev->hs_config->wTotalLength);
                 if (!is_valid_config (dev->hs_config) || total >= length)
                         goto fail;
                 kbuf += total;