[PATCH] drm/omap: fix memory leak when FB init fails

[PATCH] drm/omap: fix memory leak when FB init fails

[Tomi Valkeinen]

omap_framebuffer_create() fails to unref all the gem objects if creating
the FB fails, leading to a memory leak.

Fix the loop so that it goes through all the reffed gem objects.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/gpu/drm/omapdrm/omap_fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index ddf7a457951b..b1a762b70cbf 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -379,7 +379,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
 	return fb;
 
 error:
-	while (--i > 0)
+	while (--i >= 0)
 		drm_gem_object_unreference_unlocked(bos[i]);
 
 	return fb;
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/omap: fix memory leak when FB init fails

[Laurent Pinchart]

Hi Tomi,

Thank you for the patch.

On Friday 04 Aug 2017 12:24:10 Tomi Valkeinen wrote:
> omap_framebuffer_create() fails to unref all the gem objects if creating
> the FB fails, leading to a memory leak.
> 
> Fix the loop so that it goes through all the reffed gem objects.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
>  drivers/gpu/drm/omapdrm/omap_fb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c
> b/drivers/gpu/drm/omapdrm/omap_fb.c index ddf7a457951b..b1a762b70cbf 100644
> --- a/drivers/gpu/drm/omapdrm/omap_fb.c
> +++ b/drivers/gpu/drm/omapdrm/omap_fb.c
> @@ -379,7 +379,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct
> drm_device *dev, return fb;
> 
>  error:
> -	while (--i > 0)
> +	while (--i >= 0)

How about i-- > 0 ? That way we could make i an unsigned int as it should be, 
given that a negative array index doesn't make sense here.

>  		drm_gem_object_unreference_unlocked(bos[i]);
> 
>  	return fb;

-- 
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/omap: fix memory leak when FB init fails

[Tomi Valkeinen]

[-- Attachment #1.1.1: Type: text/plain, Size: 1313 bytes --]

On 07/08/17 14:29, Laurent Pinchart wrote:
> Hi Tomi,
> 
> Thank you for the patch.
> 
> On Friday 04 Aug 2017 12:24:10 Tomi Valkeinen wrote:
>> omap_framebuffer_create() fails to unref all the gem objects if creating
>> the FB fails, leading to a memory leak.
>>
>> Fix the loop so that it goes through all the reffed gem objects.
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> ---
>>  drivers/gpu/drm/omapdrm/omap_fb.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c
>> b/drivers/gpu/drm/omapdrm/omap_fb.c index ddf7a457951b..b1a762b70cbf 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_fb.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_fb.c
>> @@ -379,7 +379,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct
>> drm_device *dev, return fb;
>>
>>  error:
>> -	while (--i > 0)
>> +	while (--i >= 0)
> 
> How about i-- > 0 ? That way we could make i an unsigned int as it should be, 
> given that a negative array index doesn't make sense here.

I tried that too, but I think it's a bit confusing. It's nice to see the
limit of the iteration directly from the comparison, and with i--, we
decrease i after the comparison. So "> 0" actually means ">= 0 inside
the body of the while loop"...

 Tomi


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel