Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd54d98 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Patrik Jakobsson
Browse files

drm/gma500: fix double freeing 



We are allocating backing using psbfb_alloc() and so
backing->stolen is always true. So we were freeing backing two times.
Moreover if we follow the execution path then we should be freeing
backing after we have released the helper. So remove the one which frees
backing before the helper is released.
While at it the error labels are also renamed to give a meaningful
name.

[Patrik: Fixed conflict with removal of struct_mutex]

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Reviewed-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent d00b39c1

drivers/gpu/drm/gma500/framebuffer.c

+4 −9
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, 
	info = drm_fb_helper_alloc_fbi(&fbdev->psb_fb_helper);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto out_err1;

		goto err_free_range;

	}

	info->par = fbdev;
@@ -419,7 +419,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, 


	ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing);

	if (ret)

		goto out_unref;

		goto err_release;



	fb = &psbfb->base;

	psbfb->fbdev = info;
@@ -464,14 +464,9 @@ static int psbfb_create(struct psb_fbdev *fbdev, 
					psbfb->base.width, psbfb->base.height);



	return 0;

out_unref:

	if (backing->stolen)

		psb_gtt_free_range(dev, backing);

	else

		drm_gem_object_unreference_unlocked(&backing->gem);



err_release:

	drm_fb_helper_release_fbi(&fbdev->psb_fb_helper);

out_err1:

err_free_range:

	psb_gtt_free_range(dev, backing);

	return ret;

}