Patchwork [U-Boot,v2] drivers:usb: use get|put_unaligned_le16

login
register
mail settings
Submitter Piotr Wilczek
Date June 26, 2013, 6:22 a.m.
Message ID <1372227725-22459-1-git-send-email-p.wilczek@samsung.com>
Download mbox | patch
Permalink /patch/254583/
State Accepted
Delegated to: Marek Vasut
Headers show

Comments

Piotr Wilczek - June 26, 2013, 6:22 a.m.
This patch use get|put_unaligned_le16 to access structure data
to avoid data abort on some ARM platforms.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Marek Vasut <marex@denx.de>
---
Changes for v2:
- rebased on top of u-boot-usb/master

 drivers/usb/gadget/f_mass_storage.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Marek Vasut - June 26, 2013, 11:21 a.m.
Dear Piotr Wilczek,

> This patch use get|put_unaligned_le16 to access structure data
> to avoid data abort on some ARM platforms.
> 
> Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> CC: Marek Vasut <marex@denx.de>

Applied, thanks!

Best regards,
Marek Vasut

Patch

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 45bc132..5b348d7 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -577,9 +577,9 @@  static int fsg_setup(struct usb_function *f,
 {
 	struct fsg_dev		*fsg = fsg_from_func(f);
 	struct usb_request	*req = fsg->common->ep0req;
-	u16			w_index = le16_to_cpu(ctrl->wIndex);
-	u16			w_value = le16_to_cpu(ctrl->wValue);
-	u16			w_length = le16_to_cpu(ctrl->wLength);
+	u16			w_index = get_unaligned_le16(&ctrl->wIndex);
+	u16			w_value = get_unaligned_le16(&ctrl->wValue);
+	u16			w_length = get_unaligned_le16(&ctrl->wLength);
 
 	if (!fsg_is_set(fsg->common))
 		return -EOPNOTSUPP;
@@ -617,7 +617,7 @@  static int fsg_setup(struct usb_function *f,
 	     "unknown class-specific control req "
 	     "%02x.%02x v%04x i%04x l%u\n",
 	     ctrl->bRequestType, ctrl->bRequest,
-	     le16_to_cpu(ctrl->wValue), w_index, w_length);
+	     get_unaligned_le16(&ctrl->wValue), w_index, w_length);
 	return -EOPNOTSUPP;
 }