PERFORCE change 161763 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=161763

Change 161763 by hselasky at hselasky_laptop001 on 2009/05/08 08:00:16

	
	USB storage: Bugfix.
	 - make sure "bmRequestType" is checked.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#12 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#12 (text+ko) ====

@@ -466,7 +466,8 @@
 	const struct usb2_device_request *req = preq;
 
 	if (!is_complete) {
-		if (req->bRequest == UR_BBB_RESET) {
+		if ((req->bmRequestType == UT_WRITE_CLASS_INTERFACE) &&
+		    (req->bRequest == UR_BBB_RESET)) {
 			*plen = 0;
 			mtx_lock(&sc->sc_mtx);
 			ustorage_fs_transfer_stop(sc);
@@ -475,7 +476,8 @@
 			    USTORAGE_FS_T_BBB_COMMAND);
 			mtx_unlock(&sc->sc_mtx);
 			return (0);
-		} else if (req->bRequest == UR_BBB_GET_MAX_LUN) {
+		} else if ((req->bmRequestType == UT_READ_CLASS_INTERFACE) &&
+			   (req->bRequest == UR_BBB_GET_MAX_LUN)) {
 			if (offset == 0) {
 				*plen = 1;
 				*pptr = &sc->sc_last_lun;