usb: usbtest: reduce stack usage in test_queue
authorBixuan Cui <cuibixuan@huawei.com>
Fri, 17 Jul 2020 00:22:53 +0000 (08:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jul 2020 11:41:57 +0000 (13:41 +0200)
Fix the warning: [-Werror=-Wframe-larger-than=]

drivers/usb/misc/usbtest.c: In function 'test_queue':
drivers/usb/misc/usbtest.c:2148:1:
warning: the frame size of 1232 bytes is larger than 1024 bytes

Reported-by: kbuild test robot <lkp@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
Link: https://lore.kernel.org/r/ffa85702-86ab-48d7-4da2-2efcc94b05d3@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/usbtest.c

index 8b220d5..150090e 100644 (file)
@@ -2043,7 +2043,7 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param,
        unsigned                i;
        unsigned long           packets = 0;
        int                     status = 0;
-       struct urb              *urbs[MAX_SGLEN];
+       struct urb              **urbs;
 
        if (!param->sglen || param->iterations > UINT_MAX / param->sglen)
                return -EINVAL;
@@ -2051,6 +2051,10 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param,
        if (param->sglen > MAX_SGLEN)
                return -EINVAL;
 
+       urbs = kcalloc(param->sglen, sizeof(*urbs), GFP_KERNEL);
+       if (!urbs)
+               return -ENOMEM;
+
        memset(&context, 0, sizeof(context));
        context.count = param->iterations * param->sglen;
        context.dev = dev;
@@ -2137,6 +2141,8 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param,
        else if (context.errors >
                        (context.is_iso ? context.packet_count / 10 : 0))
                status = -EIO;
+
+       kfree(urbs);
        return status;
 
 fail:
@@ -2144,6 +2150,8 @@ fail:
                if (urbs[i])
                        simple_free_urb(urbs[i]);
        }
+
+       kfree(urbs);
        return status;
 }