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

Commit 0ac66eff authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: avoid leaking edid data 



In some cases we fetch the edid in the detect() callback
in order to determine what sort of monitor is connected.
If that happens, don't fetch the edid again in the get_modes()
callback or we will leak the edid.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent bf38b025

drivers/gpu/drm/radeon/radeon_display.c

+5 −0
Original line number Diff line number Diff line
@@ -830,6 +830,10 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector) 
	struct radeon_device *rdev = dev->dev_private;

	int ret = 0;



	/* don't leak the edid if we already fetched it in detect() */

	if (radeon_connector->edid)

		goto got_edid;



	/* on hw with routers, select right port */

	if (radeon_connector->router.ddc_valid)

		radeon_router_select_ddc_port(radeon_connector);
@@ -868,6 +872,7 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector) 
			radeon_connector->edid = radeon_bios_get_hardcoded_edid(rdev);

	}

	if (radeon_connector->edid) {

got_edid:

		drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);

		ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);

		drm_edid_to_eld(&radeon_connector->base, radeon_connector->edid);