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

Commit 868d665b authored by Christoph Jaeger's avatar Christoph Jaeger Committed by Daniel Vetter
Browse files

drm/i915: Fix memory leak in intel_dsi_init() error path 



intel_dsi_init() bails out without freeing the memory 'intel_dsi' and
'intel_connector' point to. Simply bail out before allocating memory.

Picked up by Coverity - CID 1222750.

Signed-off-by: default avatarChristoph Jaeger <christophjaeger@linux.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5755c78f

drivers/gpu/drm/i915/intel_dsi.c

+7 −7
Original line number Diff line number Diff line
@@ -675,6 +675,13 @@ void intel_dsi_init(struct drm_device *dev) 
	if (!dev_priv->vbt.has_mipi)

		return;



	if (IS_VALLEYVIEW(dev)) {

		dev_priv->mipi_mmio_base = VLV_MIPI_BASE;

	} else {

		DRM_ERROR("Unsupported Mipi device to reg base");

		return;

	}



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

	if (!intel_dsi)

		return;
@@ -689,13 +696,6 @@ void intel_dsi_init(struct drm_device *dev) 
	encoder = &intel_encoder->base;

	intel_dsi->attached_connector = intel_connector;



	if (IS_VALLEYVIEW(dev)) {

		dev_priv->mipi_mmio_base = VLV_MIPI_BASE;

	} else {

		DRM_ERROR("Unsupported Mipi device to reg base");

		return;

	}



	connector = &intel_connector->base;



	drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI);