Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 985C2471253 for ; Wed, 29 Jul 2026 11:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323847; cv=none; b=N3wbLtL3dVmAu37cnFg9CAiid4fnRRwJUf+0MosWli+UdEJIso9Nn6nwErOQp0ypqm+bybnI/sI0vkBjPzy8tAZ6mhN2Yckf8fnOvrxvMRfcUP9WLTy1WT/NQEbkPLuul8jg3FFh5rTNmr+6EAyB0H2/L42LNbhGjyAKMMGfWfE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323847; c=relaxed/simple; bh=nMYKp9GBUjeV9/3sqkjEolSoCufWApYUvYxnmp0SKhk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Ln6QiQtiOItYnPWmI6nwsem4L/80WmgRlahnh/Iqpi9/gVkHabWzawB3yX+q1n7zmJShBra/m6Rng3q8hBCHFBYroavOG1ZBa7GU/CmhSgewTmkfChl5qdhF+JozZ/W+diwdcHyBkI7SrNpkBA6nwtDxv8hUAMKDOjo4HK9BOdk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sy1pK0no; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sy1pK0no" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 735551F000E9; Wed, 29 Jul 2026 11:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785323845; bh=IAzW4+qjBt07+0mUBxrfcY3dQy9s/Obbv6POjCYyPQU=; h=Subject:To:Cc:From:Date; b=sy1pK0noqLAw4JCfMlzCA+tB7KLq7SKHnzE0jHFQ9tlxj4uoljseKkHKUJyh5VJqz ZeFQqJyaLCEMnZ6PKLT60lQbUGEZPFr1lSiCVf1vd9ROCA8bVaJxGcVJq+h+tam5/D tk7sFNVM8tbasIKpqIAmgphLQpzpLpWzWn1gkfJk= Subject: FAILED: patch "[PATCH] drm/i915/hdcp: require monotonically increasing seq_num_v" failed to apply to 6.1-stable tree To: jani.nikula@intel.com,joonas.lahtinen@linux.intel.com,martin.hodo@intel.com,suraj.kandpal@intel.com Cc: From: Date: Wed, 29 Jul 2026 13:17:05 +0200 Message-ID: <2026072905-sanitary-gills-9e05@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The 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 . 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 # git commit -s git send-email --to '' --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 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. Reported-by: Martin Hodo Fixes: d849178e2c9e ("drm/i915: Implement HDCP2.2 repeater authentication") Cc: stable@vger.kernel.org # v5.2+ Cc: Suraj Kandpal Reviewed-by: Suraj Kandpal Link: https://patch.msgid.link/20260625104407.1025614-1-jani.nikula@intel.com Signed-off-by: Jani Nikula (cherry picked from commit 58a224375c81179b52558c53d8857b93196d2687) Signed-off-by: Joonas Lahtinen diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 521786a75c42..0a076d2ed70a 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -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; }