]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
drm/amd/display: Add null pointer check for get_first_active_display()
authorWentao Liang <vulab@iscas.ac.cn>
Mon, 26 May 2025 02:37:31 +0000 (10:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Jul 2025 08:58:02 +0000 (10:58 +0200)
commit1ebcdf38887949def1a553ff3e45c98ed95a3cd0
tree57056f587c3bb66c16d405ad860ecfc04609eada
parent30b93a84d90e5f5591368365afad618faac9b3d1
drm/amd/display: Add null pointer check for get_first_active_display()

commit c3e9826a22027a21d998d3e64882fa377b613006 upstream.

The function mod_hdcp_hdcp1_enable_encryption() 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 in
mod_hdcp_hdcp2_enable_encryption().

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

Fixes: 2deade5ede56 ("drm/amd/display: Remove hdcp display state with mst fix")
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # v5.8
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c