Commit 41d3c0b8 authored by Peter Chen's avatar Peter Chen Committed by Felipe Balbi

usb: misc: usbtest: allocate size of urb array according to user parameter

Allocate the size of urb pointer array according to testusb's
parameter sglen, and limits the length of sglen as MAX_SGLEN
(128 currently).
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 95c8bc36
...@@ -95,6 +95,7 @@ static struct usb_device *testdev_to_usbdev(struct usbtest_dev *test) ...@@ -95,6 +95,7 @@ static struct usb_device *testdev_to_usbdev(struct usbtest_dev *test)
dev_warn(&(tdev)->intf->dev , fmt , ## args) dev_warn(&(tdev)->intf->dev , fmt , ## args)
#define GUARD_BYTE 0xA5 #define GUARD_BYTE 0xA5
#define MAX_SGLEN 128
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
...@@ -1911,10 +1912,7 @@ test_iso_queue(struct usbtest_dev *dev, struct usbtest_param *param, ...@@ -1911,10 +1912,7 @@ test_iso_queue(struct usbtest_dev *dev, struct usbtest_param *param,
unsigned i; unsigned i;
unsigned long packets = 0; unsigned long packets = 0;
int status = 0; int status = 0;
struct urb *urbs[10]; /* FIXME no limit */ struct urb *urbs[param->sglen];
if (param->sglen > 10)
return -EDOM;
memset(&context, 0, sizeof(context)); memset(&context, 0, sizeof(context));
context.count = param->iterations * param->sglen; context.count = param->iterations * param->sglen;
...@@ -2061,6 +2059,9 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf) ...@@ -2061,6 +2059,9 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf)
if (param->iterations <= 0) if (param->iterations <= 0)
return -EINVAL; return -EINVAL;
if (param->sglen > MAX_SGLEN)
return -EINVAL;
if (mutex_lock_interruptible(&dev->lock)) if (mutex_lock_interruptible(&dev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment