Commit a72a96e7 authored by Suraj Kandpal's avatar Suraj Kandpal Committed by He Yujie
Browse files

drm/i915/hdcp: Add encoder check in hdcp2_get_capability 

mainline inclusion
from mainline-v6.12-rc1
commit d34f4f058edf1235c103ca9c921dc54820d14d40
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KQZ
CVE: CVE-2024-53050

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d34f4f058edf1235c103ca9c921dc54820d14d40



--------------------------------

Add encoder check in intel_hdcp2_get_capability to avoid
null pointer error.

Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarDnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240722064451.3610512-3-suraj.kandpal@intel.com


Conflicts:
	drivers/gpu/drm/i915/display/intel_hdcp.c
	drivers/gpu/drm/i915/display/intel_dp_hdcp.c
[ Context conflict:
  130849f8ec14("drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable")
  a35239a89259("drm/i915/hdcp: Use correct aux for capability check scenario")
  287c0de8b294("drm/i915/hdcp: Move to direct reads for HDCP")
  55d9b2b8e440("drm/i915/hdcp: Refactor intel_dp_hdcp2_capable")
  8e754d9e9e8a("drm/i915/hdcp: Rename hdcp capable functions")
  the above patches are not merge.
]
Signed-off-by: default avatarHe Yujie <coka.heyujie@huawei.com>
parent 6aa478cf

drivers/gpu/drm/i915/display/intel_hdcp.c

+6 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ bool intel_hdcp_capable(struct intel_connector *connector) 
/* Is HDCP2.2 capable on Platform and Sink */

bool intel_hdcp2_capable(struct intel_connector *connector)

{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct intel_digital_port *dig_port;

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_hdcp *hdcp = &connector->hdcp;

	bool capable = false;
@@ -103,6 +103,11 @@ bool intel_hdcp2_capable(struct intel_connector *connector) 
	}

	mutex_unlock(&dev_priv->hdcp_comp_mutex);



	if (!intel_attached_encoder(connector))

		return false;



	dig_port = intel_attached_dig_port(connector);



	/* Sink's capability for HDCP2.2 */

	hdcp->shim->hdcp_2_2_capable(dig_port, &capable);