Commit 7a2ca2ea authored by Chenyuan Yang's avatar Chenyuan Yang Committed by Alex Deucher
Browse files

drm/amd/display: Add null pointer check in mod_hdcp_hdcp1_create_session() 



The function mod_hdcp_hdcp1_create_session() calls the function
get_first_active_display(), but does not check its return value.
The return value is a null pointer if the display list is empty.
This will lead to a null pointer dereference.

Add a null pointer check for get_first_active_display() and return
MOD_HDCP_STATUS_DISPLAY_NOT_FOUND if the function return null.

This is similar to the commit c3e9826a
("drm/amd/display: Add null pointer check for get_first_active_display()").

Fixes: 2deade5e ("drm/amd/display: Remove hdcp display state with mst fix")
Signed-off-by: default avatarChenyuan Yang <chenyuan0y@gmail.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5e43eb3c)
parent 66af73a1

drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ enum mod_hdcp_status mod_hdcp_hdcp1_create_session(struct mod_hdcp *hdcp) 
		return MOD_HDCP_STATUS_FAILURE;

	}



	if (!display)

		return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND;



	hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;



	mutex_lock(&psp->hdcp_context.mutex);