From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3BD31DFF4; Mon, 1 Apr 2024 17:03:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711991021; cv=none; b=aXJucW5Ws/SKgiKBsuXEF+PoZDGYJkIZAMJmCipPXm/pfqT/74ftm1jSHjcUycwQ9pO8Qu1wCO1djlW2T7IuXUkBdewcI0Eitk1fu4yOn8qLD+ufladgsjFSe+uVfR5wqWokQHkfQFd9/2rgRPFterzGHKfiymXCAGWuapRYHxU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711991021; c=relaxed/simple; bh=T13wgKCTpD9Xvh6E/Sp79hIoDUlgw+PcDSx+LfL+OMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OS/m05WHxQ9mjtHrjL0golnj6ATcmxz07pMQ3kUZ+0h65HuUCPum6lu/Rkw4N0g0tV5ylJOe3srbEyAVrUYHmofCPAbaw91X5SnttQR/pedkLNaWqNfp+YZPsrXkUdvNFi0EOMM4HOzxBxtPl5xV2AqywfRR7d/1D7X2uhddktY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QanTiGm4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QanTiGm4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05319C433C7; Mon, 1 Apr 2024 17:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711991020; bh=T13wgKCTpD9Xvh6E/Sp79hIoDUlgw+PcDSx+LfL+OMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QanTiGm4xBVIT2kDJdhxD2WxwO5I5kiAJEqVEwIANK1wuEOqZIaHqA6kf0sfAJgbJ jQljcF7+bAcWXzAPeWlUzf1+UaHY9AVkK0ZsZ44ypJxrhwhJE8T/r1jy9EMKiHY0BT wQeRNA5LK81j05u9nyJWo7EtYyQlONcX3u4JMVDs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Alex Deucher , Alex Hung , Rodrigo Siqueira , Daniel Wheeler , Sasha Levin Subject: [PATCH 6.1 138/272] drm/amd/display: Return the correct HDCP error code Date: Mon, 1 Apr 2024 17:45:28 +0200 Message-ID: <20240401152534.993575794@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152530.237785232@linuxfoundation.org> References: <20240401152530.237785232@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rodrigo Siqueira [ Upstream commit e64b3f55e458ce7e2087a0051f47edabf74545e7 ] [WHY & HOW] If the display is null when creating an HDCP session, return a proper error code. Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Acked-by: Alex Hung Signed-off-by: Rodrigo Siqueira Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c index ee67a35c2a8ed..ff930a71e496a 100644 --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c @@ -513,6 +513,9 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp) hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf; memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory)); + if (!display) + return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND; + hdcp_cmd->in_msg.hdcp2_create_session_v2.display_handle = display->index; if (hdcp->connection.link.adjust.hdcp2.force_type == MOD_HDCP_FORCE_TYPE_0) -- 2.43.0