cmd: usb: check if_type before using this device

PATCH New Peng Fan 3 participants 3 messages Jun 17, 2016

Share & tools

Peng Fan

author

2016-06-17 06:18 UTC #0 lore raw

PATCH 1/1 cmd: usb: check if_type before using this device

For legacy usb storage driver, USB_MAX_STOR_DEV is defined as 7. If we only have one usb disk on board, usb dev 0 is ok. But if usb dev 1, still ok, then usb read xxx will trigger system fault and reboot.

So check if_type before using this device.

Signed-off-by Peng Fan <[email protected]>

Cc Simon Glass <[email protected]>

Cc Hans de Goede <[email protected]>

Cc Bin Meng <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Stefan Roese <[email protected]>

Cc Marcel Ziswiler <[email protected]>

Cc Peng Fan <[email protected]>

Cc Stephen Warren <[email protected]>

---
 cmd/usb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

cmd/usb.c +2 -1

index b83d323..58d9db2 100644
@@ -800,7 +800,8 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			int dev = (int)simple_strtoul(argv[2], NULL, 10);
 			printf("\nUSB device %d: ", dev);
 			stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, dev);
-			if (stor_dev == NULL) {
+			if ((stor_dev == NULL) ||
+			    (stor_dev->if_type == IF_TYPE_UNKNOWN)) {
 				printf("unknown device\n");
 				return 1;
 			}

Signature · 1 line

2.6.2

Marek Vasut

Applied

2016-06-17 22:48 UTC #1 lore raw

PATCH 1/1 cmd: usb: check if_type before using this device

Quoted 6 lines · Peng Fan

For legacy usb storage driver, USB_MAX_STOR_DEV is defined as 7. If we only have one usb disk on board, usb dev 0 is ok. But if usb dev 1, still ok, then usb read xxx will trigger system fault and reboot.
So check if_type before using this device.

Applied, thanks

Quoted 28 lines

Signed-off-by Peng Fan <[email protected]>
Cc Simon Glass <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Marcel Ziswiler <[email protected]>
Cc Peng Fan <[email protected]>
Cc Stephen Warren <[email protected]>
---
 cmd/usb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
cmd/usb.c +2 -1
index b83d323..58d9db2 100644
@@ -800,7 +800,8 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			int dev = (int)simple_strtoul(argv[2], NULL, 10);
 			printf("\nUSB device %d: ", dev);
 			stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, dev);
-			if (stor_dev == NULL) {
+			if ((stor_dev == NULL) ||
+			    (stor_dev->if_type == IF_TYPE_UNKNOWN)) {
 				printf("unknown device\n");
 				return 1;
 			}

Signature · 2 lines

Best regards,
Marek Vasut

Simon Glass

2016-06-17 23:00 UTC #2 lore raw

PATCH 1/1 cmd: usb: check if_type before using this device

In reply to Peng Fan

Quoted 16 lines · Peng Fan

For legacy usb storage driver, USB_MAX_STOR_DEV is defined as 7. If we only have one usb disk on board, usb dev 0 is ok. But if usb dev 1, still ok, then usb read xxx will trigger system fault and reboot.
So check if_type before using this device.
Signed-off-by Peng Fan <[email protected]>
Cc Simon Glass <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Marcel Ziswiler <[email protected]>
Cc Peng Fan <[email protected]>
Cc Stephen Warren <[email protected]>

Quoted 3 lines

---
 cmd/usb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by Simon Glass <[email protected]>