Skip to contentSkip to conversation

patch "usb: misc: usbtest: usbtest_do_ioctl may return positive integer" added to usb-linus

PATCH [email protected] 1 participant 1 message Aug 9, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: misc: usbtest: usbtest_do_ioctl may return positive integer

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 28324936f3d672bbf83472fece8f36a158a52276 Mon Sep 17 00:00:00 2001

From: Peter Chen <[email protected]>
Date: Tue, 26 Jul 2016 16:01:30 +0800
Subject: usb: misc: usbtest: usbtest_do_ioctl may return positive integer

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.

Cc stable <[email protected]>
Fixes 18fc4ebdc705 ("usb: misc: usbtest: Remove timeval usage")
---
 drivers/usb/misc/usbtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/usbtest.c +1 -1
index 6b978f04b8d7..5e3464e8d4e5 100644
@@ -2602,7 +2602,7 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf)
 	ktime_get_ts64(&start);
 
 	retval = usbtest_do_ioctl(intf, param_32);
-	if (retval)
+	if (retval < 0)
 		goto free_mutex;
 
 	ktime_get_ts64(&end);
Signature · 1 line
2.9.2