Commit 648d3f4d authored by Takashi Iwai's avatar Takashi Iwai Committed by Alex Deucher
Browse files

drm/amd/display: Add sanity checks for drm_edid_raw() 

When EDID is retrieved via drm_edid_raw(), it doesn't guarantee to
return proper EDID bytes the caller wants: it may be either NULL (that
leads to an Oops) or with too long bytes over the fixed size raw_edid
array (that may lead to memory corruption).  The latter was reported
actually when connected with a bad adapter.

Add sanity checks for drm_edid_raw() to address the above corner
cases, and return EDID_BAD_INPUT accordingly.

Fixes: 48edb2a4 ("drm/amd/display: switch amdgpu_dm_connector to use struct drm_edid")
Link: https://bugzilla.suse.com/show_bug.cgi?id=1236415


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b92cb40

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+4 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,10 @@ enum dc_edid_status dm_helpers_read_local_edid( 
			return EDID_NO_RESPONSE;



		edid = drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw()

		if (!edid ||

		    edid->extensions >= sizeof(sink->dc_edid.raw_edid) / EDID_LENGTH)

			return EDID_BAD_INPUT;



		sink->dc_edid.length = EDID_LENGTH * (edid->extensions + 1);

		memmove(sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length);