2021-05-13 09:39:41

by Zou Wei

[permalink] [raw]

Subject: [PATCH -next] drm/aperture: Fix missing unlock on error in devm_aperture_acquire()

---

Add the missing unlock before return from function devm_aperture_acquire()
in the error handling case.

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zou Wei <[email protected]>
---
drivers/gpu/drm/drm_aperture.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
index 33bf018..9335d9d 100644
--- a/drivers/gpu/drm/drm_aperture.c
+++ b/drivers/gpu/drm/drm_aperture.c
@@ -164,13 +164,17 @@ static int devm_aperture_acquire(struct drm_device *dev,

list_for_each(pos, &drm_apertures) {
ap = container_of(pos, struct drm_aperture, lh);
- if (overlap(base, end, ap->base, ap->base + ap->size))
+ if (overlap(base, end, ap->base, ap->base + ap->size)) {
+ mutex_unlock(&drm_apertures_lock);
return -EBUSY;
+ }
}

ap = devm_kzalloc(dev->dev, sizeof(*ap), GFP_KERNEL);
- if (!ap)
+ if (!ap) {
+ mutex_unlock(&drm_apertures_lock);
return -ENOMEM;
+ }

ap->dev = dev;
ap->base = base;
--
2.6.2

2021-05-13 13:12:24

by Thomas Zimmermann

[permalink] [raw]

Subject: Re: [PATCH -next] drm/aperture: Fix missing unlock on error in devm_aperture_acquire()

---

Hi

Am 13.05.21 um 10:46 schrieb Zou Wei:
> Add the missing unlock before return from function devm_aperture_acquire()
> in the error handling case.
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zou Wei <[email protected]>

I added a Fixes tag and queued up the patch for drm-misc-next. Thanks!

Best regards
Thomas

> ---
> drivers/gpu/drm/drm_aperture.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
> index 33bf018..9335d9d 100644
> --- a/drivers/gpu/drm/drm_aperture.c
> +++ b/drivers/gpu/drm/drm_aperture.c
> @@ -164,13 +164,17 @@ static int devm_aperture_acquire(struct drm_device *dev,
>
> list_for_each(pos, &drm_apertures) {
> ap = container_of(pos, struct drm_aperture, lh);
> - if (overlap(base, end, ap->base, ap->base + ap->size))
> + if (overlap(base, end, ap->base, ap->base + ap->size)) {
> + mutex_unlock(&drm_apertures_lock);
> return -EBUSY;
> + }
> }
>
> ap = devm_kzalloc(dev->dev, sizeof(*ap), GFP_KERNEL);
> - if (!ap)
> + if (!ap) {
> + mutex_unlock(&drm_apertures_lock);
> return -ENOMEM;
> + }
>
> ap->dev = dev;
> ap->base = base;
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

---

Attachments:

OpenPGP_signature (855.00 B)
OpenPGP digital signature