From 28c48bca0a20052eacdad9baed7f693240c6f482 Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Mon, 9 Apr 2012 15:48:55 -0400 Subject: [PATCH] --- yaml --- r: 299427 b: refs/heads/master c: e65cdfae71cecec0fcd43a3f9ac8b5e4ae52db08 h: refs/heads/master i: 299425: bb26e2cfddc89b734ecb8bf12ff8aaedfae6178b 299423: c18a0543ed7e425646a8b471c7371cee29117ff1 v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/usbtest.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bfcf2cddc1f8..ab1fd73e7e4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8963c487a80b4688c9e68dcc504a90074aacc145 +refs/heads/master: e65cdfae71cecec0fcd43a3f9ac8b5e4ae52db08 diff --git a/trunk/drivers/usb/misc/usbtest.c b/trunk/drivers/usb/misc/usbtest.c index 959145baf3cf..967254afb6e8 100644 --- a/trunk/drivers/usb/misc/usbtest.c +++ b/trunk/drivers/usb/misc/usbtest.c @@ -904,6 +904,9 @@ test_ctrl_queue(struct usbtest_dev *dev, struct usbtest_param *param) struct ctrl_ctx context; int i; + if (param->sglen == 0 || param->iterations > UINT_MAX / param->sglen) + return -EOPNOTSUPP; + spin_lock_init(&context.lock); context.dev = dev; init_completion(&context.complete); @@ -1981,8 +1984,6 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf) /* queued control messaging */ case 10: - if (param->sglen == 0) - break; retval = 0; dev_info(&intf->dev, "TEST 10: queue %d control calls, %d times\n",