[PATCH 4.7 031/143] usb: misc: usbtest: usbtest_do_ioctl may return positive integer

From: Greg Kroah-Hartman
Date: Mon Sep 05 2016 - 13:39:30 EST


4.7-stable review patch. If anyone has any objections, please let me know.

------------------

From: Peter Chen <peter.chen@xxxxxxx>

commit 528d28138f91009f230903bd89ccd44719667831 upstream.

For case 14 and case 21, their correct return value is the number
of bytes transferred, so it is a positive integer. But in usbtest_ioctl,
it takes non-zero as false return value for usbtest_do_ioctl, so
it will treat the correct test as wrong test, then the time on
tests will be the minus value.

Signed-off-by: Peter Chen <peter.chen@xxxxxxx>
Fixes: 18fc4ebdc705 ("usb: misc: usbtest: Remove timeval usage")
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/usb/misc/usbtest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -2603,7 +2603,7 @@ usbtest_ioctl(struct usb_interface *intf
ktime_get_ts64(&start);

retval = usbtest_do_ioctl(intf, param_32);
- if (retval)
+ if (retval < 0)
goto free_mutex;

ktime_get_ts64(&end);