mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 08/11] drm/udl: Fix potential URB leaks
Date: Tue,  6 Sep 2022 09:39:48 +0200	[thread overview]
Message-ID: <20220906073951.2085-9-tiwai@suse.de> (raw)
In-Reply-To: <20220906073951.2085-1-tiwai@suse.de>

A couple of error handlings forgot to process the URB completion.
Those are both with WARN_ON() so should be visible, but we must fix
them in anyway.

Fixes: 7350b2a3fbc6 ("drm/udl: Replace BUG_ON() with WARN_ON()")
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/drm/udl/udl_main.c     | 8 +++++---
 drivers/gpu/drm/udl/udl_transfer.c | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 2b7eafd48ec2..de28eeff3155 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -260,11 +260,13 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
 	struct udl_device *udl = to_udl(dev);
 	int ret;
 
-	if (WARN_ON(len > udl->urbs.size))
-		return -EINVAL;
-
+	if (WARN_ON(len > udl->urbs.size)) {
+		ret = -EINVAL;
+		goto error;
+	}
 	urb->transfer_buffer_length = len; /* set to actual payload len */
 	ret = usb_submit_urb(urb, GFP_ATOMIC);
+ error:
 	if (ret) {
 		udl_urb_completion(urb); /* because no one else will */
 		DRM_ERROR("usb_submit_urb error %x\n", ret);
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index a431208dda85..b57844632dbd 100644
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c
@@ -180,8 +180,11 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
 	u8 *cmd = *urb_buf_ptr;
 	u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length;
 
-	if (WARN_ON(!(log_bpp == 1 || log_bpp == 2)))
+	if (WARN_ON(!(log_bpp == 1 || log_bpp == 2))) {
+		/* need to finish URB at error from this function */
+		udl_urb_completion(urb);
 		return -EINVAL;
+	}
 
 	line_start = (u8 *) (front + byte_offset);
 	next_pixel = line_start;
-- 
2.35.3


  parent reply	other threads:[~2022-09-06  7:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-06  7:39 [PATCH v2 00/11] drm/udl: More fixes Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 01/11] drm/udl: Restore display mode on resume Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 02/11] drm/udl: Add reset_resume Takashi Iwai
2022-09-07  6:58   ` Daniel Vetter
2022-09-06  7:39 ` [PATCH v2 03/11] drm/udl: Enable damage clipping Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 04/11] Revert "drm/udl: Kill pending URBs at suspend and disconnect" Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 05/11] drm/udl: Suppress error print for -EPROTO at URB completion Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 06/11] drm/udl: Increase the default URB list size to 20 Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 07/11] drm/udl: Drop unneeded alignment Takashi Iwai
2022-09-07  7:29   ` Thomas Zimmermann
2022-09-08  7:01     ` Takashi Iwai
2022-09-06  7:39 ` Takashi Iwai [this message]
2022-09-06  7:39 ` [PATCH v2 09/11] drm/udl: Fix inconsistent urbs.count value during udl_free_urb_list() Takashi Iwai
2022-09-07  7:31   ` Thomas Zimmermann
2022-09-06  7:39 ` [PATCH v2 10/11] drm/udl: Don't re-initialize stuff at retrying the URB list allocation Takashi Iwai
2022-09-06  7:39 ` [PATCH v2 11/11] drm/udl: Sync pending URBs at the end of suspend Takashi Iwai
2022-09-07  7:34   ` Thomas Zimmermann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220906073951.2085-9-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®