Unverified Commit 1fb08473 authored Jul 11, 2024 by Cristian Ciocaltea Committed by Robert Foss Aug 05, 2024

drm/bridge-connector: Fix double free in error handling paths

The recent switch to drmm allocation in drm_bridge_connector_init() may
cause double free on bridge_connector in some of the error handling
paths.

Drop the explicit kfree() calls on bridge_connector.

Fixes: c12907be ("drm/bridge-connector: switch to using drmm allocations")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: default avatarRobert Foss <rfoss@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711-bridge-connector-fix-dbl-free-v1-1-d558b2d0eb93@collabora.com

parent ce4a9958

drivers/gpu/drm/drm_bridge_connector.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -443,10 +443,8 @@ struct drm_connector drm_bridge_connector_init(struct drm_device drm,
		panel_bridge = bridge;
		}

		if (connector_type == DRM_MODE_CONNECTOR_Unknown) {
		kfree(bridge_connector);
		if (connector_type == DRM_MODE_CONNECTOR_Unknown)
		return ERR_PTR(-EINVAL);
		}

		if (bridge_connector->bridge_hdmi)
		ret = drmm_connector_hdmi_init(drm, connector,
		@@ -461,10 +459,8 @@ struct drm_connector drm_bridge_connector_init(struct drm_device drm,
		ret = drmm_connector_init(drm, connector,
		&drm_bridge_connector_funcs,
		connector_type, ddc);
		if (ret) {
		kfree(bridge_connector);
		if (ret)
		return ERR_PTR(ret);
		}

		drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs);