[PATCH] drm: fb: cma: fix memory leak

Daniel Vetter daniel at ffwll.ch
Mon Jun 13 07:52:49 UTC 2016


On Sun, Jun 12, 2016 at 04:03:56PM +0100, Sudip Mukherjee wrote:
> We may have a situation that the memory allocation for fbdefio fails
> and then the allocation for fbops may succeed as some memory has been
> freed somewhere. Lets free fbops also to face these rare situtation.
> Since kfree can handle arguments as NULL, there should not be any
> problem in calling both the kfree().
> 
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee at codethink.co.uk>

Thanks for the patch, applied to drm-misc. For next time around please
figure out which patch created the broken using git blame. Then cite
that in your commit message and cc the author/reviewers of the broken
commit when submitting your fix.
-Daniel

> ---
>  drivers/gpu/drm/drm_fb_cma_helper.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
> index 2e7ef0b..c0b0c71 100644
> --- a/drivers/gpu/drm/drm_fb_cma_helper.c
> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c
> @@ -346,6 +346,7 @@ static int drm_fbdev_cma_defio_init(struct fb_info *fbi,
>  	fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);
>  	if (!fbdefio || !fbops) {
>  		kfree(fbdefio);
> +		kfree(fbops);
>  		return -ENOMEM;
>  	}
>  
> -- 
> 1.9.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list