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

Commit 33cd3c07 authored by Russell King's avatar Russell King
Browse files

drm/armada: fix leak of crtc structure 



Fix the leak of the CRTC structure in the failure paths of
armada_drm_crtc_create().

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 4fbd8d19

drivers/gpu/drm/armada/armada_crtc.c

+13 −12
Original line number Diff line number Diff line
@@ -1225,17 +1225,13 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, 


	ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",

			       dcrtc);

	if (ret < 0) {

		kfree(dcrtc);

		return ret;

	}

	if (ret < 0)

		goto err_crtc;



	if (dcrtc->variant->init) {

		ret = dcrtc->variant->init(dcrtc, dev);

		if (ret) {

			kfree(dcrtc);

			return ret;

		}

		if (ret)

			goto err_crtc;

	}



	/* Ensure AXI pipeline is enabled */
@@ -1246,13 +1242,15 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, 
	dcrtc->crtc.port = port;



	primary = kzalloc(sizeof(*primary), GFP_KERNEL);

	if (!primary)

		return -ENOMEM;

	if (!primary) {

		ret = -ENOMEM;

		goto err_crtc;

	}



	ret = armada_drm_plane_init(primary);

	if (ret) {

		kfree(primary);

		return ret;

		goto err_crtc;

	}



	ret = drm_universal_plane_init(drm, &primary->base, 0,
@@ -1263,7 +1261,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, 
				       DRM_PLANE_TYPE_PRIMARY, NULL);

	if (ret) {

		kfree(primary);

		return ret;

		goto err_crtc;

	}



	ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL,
@@ -1282,6 +1280,9 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, 


err_crtc_init:

	primary->base.funcs->destroy(&primary->base);

err_crtc:

	kfree(dcrtc);



	return ret;

}