summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2018-06-03 16:40:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-05 09:16:23 +0200
commit8f02d4bb5a8a9ba242c31a7f44cf9958882599ba (patch)
treefc005f1dbd179af0524753b7032aac39b85922a7
parente0dd67c762f650aae847260ddda8ffcaf15c477d (diff)
downloadlinux-stable-8f02d4bb5a8a9ba242c31a7f44cf9958882599ba.tar.gz
linux-stable-8f02d4bb5a8a9ba242c31a7f44cf9958882599ba.tar.bz2
linux-stable-8f02d4bb5a8a9ba242c31a7f44cf9958882599ba.zip
udl-kms: change down_interruptible to down
commit 8456b99c16d193c4c3b7df305cf431e027f0189c upstream. If we leave urbs around, it causes not only leak, but also memory corruption. This patch fixes the function udl_free_urb_list, so that it always waits for all urbs that are in progress. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/udl/udl_main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 33dbfb2c4748..2d7d7e0b2a23 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -141,18 +141,13 @@ static void udl_free_urb_list(struct drm_device *dev)
struct list_head *node;
struct urb_node *unode;
struct urb *urb;
- int ret;
unsigned long flags;
DRM_DEBUG("Waiting for completes and freeing all render urbs\n");
/* keep waiting and freeing, until we've got 'em all */
while (count--) {
-
- /* Getting interrupted means a leak, but ok at shutdown*/
- ret = down_interruptible(&udl->urbs.limit_sem);
- if (ret)
- break;
+ down(&udl->urbs.limit_sem);
spin_lock_irqsave(&udl->urbs.lock, flags);