FAILED: patch "[PATCH] drm/i915/hdcp: require monotonically increasing seq_num_v" failed to apply to 6.1-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x db9e64c983dcb07ff256bd455f258c44aa530ff8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072905-sanitary-gills-9e05@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From db9e64c983dcb07ff256bd455f258c44aa530ff8 Mon Sep 17 00:00:00 2001
From: Jani Nikula <[email protected]>
Date: Thu, 25 Jun 2026 13:44:07 +0300
Subject: [PATCH] drm/i915/hdcp: require monotonically increasing seq_num_v
The HDCP 2.2 specification requires the seq_num_v to be monotonically increasing, and repeated seq_num_v needs to be treated as an integrity failure. Make it so.
For the first message, seq_num_v must be zero, and is already checked. We can only check for less-than-or-equal for the subsequent messages, where hdcp2_encrypted is true.
Discovered using AI-assisted static analysis confirmed by Intel Product Security.
drivers/gpu/drm/i915/display/intel_hdcp.c +4 -3
@@ -1801,9 +1801,10 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)return -EINVAL ; } -if (seq_num_v < hdcp->seq_num_v) { -/* Roll over of the seq_num_v from repeater. Reauthenticate. */ -drm_dbg_kms (display->drm,"Seq_num_v roll over.\n" ); +if (hdcp->hdcp2_encrypted && seq_num_v <= hdcp->seq_num_v) { +/* Reauthenticate on Seq_num_v repeat or rollover */ +drm_dbg_kms (display->drm,"Seq_num_v %s\n" , + seq_num_v == hdcp->seq_num_v ?"repeat" :"rollover" );return -EINVAL ; }
Sasha Levin
maintainerPATCH 1/2 drm/i915/hdcp: Move to using intel_display in intel_hdcp
From: Suraj Kandpal <[email protected]>
[ Upstream commit e35bf8f6a0ff06ceeff15bb032351cd5d006f92b ]
Move to using intel_display wherever possible in intel_hdcp.c as a part of code refactor.
--v2
-Move intel_display to the first line wherever possible [Jani] -use the closest reference when using to_intel_display [Jani]
Stable-dep-of: db9e64c983dc ("drm/i915/hdcp: require monotonically increasing seq_num_v")
--- drivers/gpu/drm/i915/display/intel_display_core.h | 3 +++ drivers/gpu/drm/i915/display/intel_hdcp.c | 12 ++++++------ drivers/gpu/drm/i915/i915_driver.c | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +3 -0
@@ -244,6 +244,9 @@ struct intel_wm { };struct intel_display { +/* drm device backpointer */ +struct drm_device *drm; +/* Display functions */ struct {/* Top level crtc-ish functions */
drivers/gpu/drm/i915/display/intel_hdcp.c +6 -6
@@ -1634,8 +1634,8 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector)static int hdcp2_authenticate_repeater_topology (struct intel_connector *connector) { +struct intel_display *display = &to_i915 (connector->base.dev)->display;struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;union {struct hdcp2_rep_send_receiverid_list recvid_list;
@@ -1655,7 +1655,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)if (HDCP_2_2_MAX_CASCADE_EXCEEDED (rx_info[1 ]) ||HDCP_2_2_MAX_DEVS_EXCEEDED (rx_info[1 ])) { -drm_dbg_kms (&dev_priv->drm,"Topology Max Size Exceeded\n" ); +drm_dbg_kms (display->drm,"Topology Max Size Exceeded\n" );return -EINVAL ; }
@@ -1672,23 +1672,23 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)drm_hdcp_be24_to_cpu ((const u8 *)msgs.recvid_list.seq_num_v);if (!hdcp->hdcp2_encrypted && seq_num_v) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Non zero Seq_num_v at first RecvId_List msg\n" );return -EINVAL ; }if (seq_num_v < hdcp->seq_num_v) {/* Roll over of the seq_num_v from repeater. Reauthenticate. */ -drm_dbg_kms (&dev_priv->drm,"Seq_num_v roll over.\n" ); +drm_dbg_kms (display->drm,"Seq_num_v roll over.\n" );return -EINVAL ; } device_cnt = (HDCP_2_2_DEV_COUNT_HI (rx_info[0 ]) <<4 |HDCP_2_2_DEV_COUNT_LO (rx_info[1 ])); -if (drm_hdcp_check_ksvs_revoked (&dev_priv->drm, +if (drm_hdcp_check_ksvs_revoked (display->drm, msgs.recvid_list.receiver_ids, device_cnt) >0 ) { -drm_err (&dev_priv->drm,"Revoked receiver ID(s) is in list\n" ); +drm_err (display->drm,"Revoked receiver ID(s) is in list\n" );return -EPERM ; }
drivers/gpu/drm/i915/i915_driver.c +3 -0
@@ -844,6 +844,9 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, i915); +/* Add drm device backpointer as early as possible. */ + i915->display.drm = &i915->drm; +/* Device parameters start as a copy of module parameters. */ i915_params_copy (&i915->params, &i915_modparams);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 drm/i915/hdcp: require monotonically increasing seq_num_v
From: Jani Nikula <[email protected]>
[ Upstream commit db9e64c983dcb07ff256bd455f258c44aa530ff8 ]
The HDCP 2.2 specification requires the seq_num_v to be monotonically increasing, and repeated seq_num_v needs to be treated as an integrity failure. Make it so.
For the first message, seq_num_v must be zero, and is already checked. We can only check for less-than-or-equal for the subsequent messages, where hdcp2_encrypted is true.
Discovered using AI-assisted static analysis confirmed by Intel Product Security.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +4 -3
@@ -1677,9 +1677,10 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)return -EINVAL ; } -if (seq_num_v < hdcp->seq_num_v) { -/* Roll over of the seq_num_v from repeater. Reauthenticate. */ -drm_dbg_kms (display->drm,"Seq_num_v roll over.\n" ); +if (hdcp->hdcp2_encrypted && seq_num_v <= hdcp->seq_num_v) { +/* Reauthenticate on Seq_num_v repeat or rollover */ +drm_dbg_kms (display->drm,"Seq_num_v %s\n" , + seq_num_v == hdcp->seq_num_v ?"repeat" :"rollover" );return -EINVAL ; }
Signature · 1 line
2.53.0