OSDN Git Service

drm/udl: Don't re-initialize stuff at retrying the URB list allocation
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Sep 2022 09:51:14 +0000 (11:51 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Sat, 10 Sep 2022 19:45:52 +0000 (21:45 +0200)
udl_alloc_urb_list() retires the allocation if there is no enough room
left, and it reinitializes the stuff unnecessarily such as the linked
list head and the waitqueue, which could be harmful.  Those should be
outside the retry loop.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908095115.23396-12-tiwai@suse.de
drivers/gpu/drm/udl/udl_main.c

index 16aa4a6..829edb6 100644 (file)
@@ -182,15 +182,14 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
        struct usb_device *udev = udl_to_usb_device(udl);
 
        spin_lock_init(&udl->urbs.lock);
-
-retry:
-       udl->urbs.size = size;
        INIT_LIST_HEAD(&udl->urbs.list);
-
        init_waitqueue_head(&udl->urbs.sleep);
        udl->urbs.count = 0;
        udl->urbs.available = 0;
 
+retry:
+       udl->urbs.size = size;
+
        while (udl->urbs.count * size < wanted_size) {
                unode = kzalloc(sizeof(struct urb_node), GFP_KERNEL);
                if (!unode)