Skip to content

Commit 2ee86b7

Browse files
WhiteFox-Projectgregkh
authored andcommitted
drm/amd/display: Add null pointer check in mod_hdcp_hdcp1_create_session()
[ Upstream commit 7a2ca2e ] 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 c3e9826 ("drm/amd/display: Add null pointer check for get_first_active_display()"). Fixes: 2deade5 ("drm/amd/display: Remove hdcp display state with mst fix") Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com> Reviewed-by: Alex Hung <alex.hung@amd.com> Tested-by: Dan Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 5e43eb3) Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7a8c8aa commit 2ee86b7

File tree

1 file changed

+3
-0
lines changed
  • drivers/gpu/drm/amd/display/modules/hdcp

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ enum mod_hdcp_status mod_hdcp_hdcp1_create_session(struct mod_hdcp *hdcp)
260260
return MOD_HDCP_STATUS_FAILURE;
261261
}
262262

263+
if (!display)
264+
return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND;
265+
263266
hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;
264267

265268
mutex_lock(&psp->hdcp_context.mutex);

0 commit comments

Comments
 (0)