From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0839CCA5FC5 for ; Wed, 30 Sep 2026 13:48:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA0E510F416; Wed, 30 Sep 2026 13:48:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=trailofbits.com header.i=@trailofbits.com header.b="ddBuN2zg"; dkim-atps=neutral Received: from mail-dy2-f43.google.com (mail-dy2-f43.google.com [74.125.229.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id A8F3010E16F for ; Wed, 30 Sep 2026 01:03:40 +0000 (UTC) Received: by mail-dy2-f43.google.com with SMTP id 5a478bee46e88-34b223602d7so975467eec.2 for ; Tue, 29 Sep 2026 18:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1790730220; x=1791335020; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PFwFCHroA09S10Beb/3mqXg3PAfAFcLcaaVX6WAqpVQ=; b=ddBuN2zgwAb3C2/PPsOg9EosO+Pwe2QaQXKAt1r4leL8SnwAXtcv9Mi6AmNltbvZy3 c30IBxPmPBfh/RyWEH7a3enHs3PXa+lPokmeIvqnVoQAQbi1zzUgi4JxxxiZPIoJU6/z kS1mna+9eY5UHie1aAJiC9yWrxbwv8vhn40u28jMB0vNLHg3+GdXcNJD9TpCjpzIa1sM PUNJxnkf+0OuK3qLKLt6aW2D0g+PqjbI5j4QMWwBGNrKX0k4gEGU4pgAnEM6AbMDTEMx WEGnTXuK9avveUDQJMjlGoSNMeUQnF0JBw4bQKoEOhd98p+cRdwQQifM1vW4pdK71mZ6 96SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790730220; x=1791335020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=PFwFCHroA09S10Beb/3mqXg3PAfAFcLcaaVX6WAqpVQ=; b=nDzZzrpZyeull/stuwSKG30kB/2mJHw1y1/RsF5DIkjpDmzuFbHIB2eKn9vQ6BeFKA GNYgcI3WIGXn9ujM1PR8DhUPfDHyAfuKjB6npoPX2tTgLBbMIR1P+sdLSCGWqb9/i424 FcraimXUD+aFDL4uCjKoo0/mxqSHn7aP/goaavgXqKgojAQj3vYorQewxLxU/ubmnoxA BfUXm7dCo4oTwMb5Lcql2RS1dvuxOHbSXioi9t1NYNzSnWdmKxp7gbTlSOcRk2y3XcLx EPvl+ddIVRwEkDX6fxxH/R1QBv+pKwf6cs0lyq1jPA0TMhD1enoUqmscbF8IunwxQUVs jMNQ== X-Forwarded-Encrypted: i=1; AKwUvBxFXQniQmbGCQrlTxRTQZFTPm7eobHWDztibqjcDXSiUKXaHGWPNFQcIKRnkkJdo8kcrBKXs0b6aw==@lists.freedesktop.org X-Gm-Message-State: AFuF++nzGyiLSgr9G2c43lXai+vb5pNEVSCV69D8jSab/KYmuzwlMotf k2g7kIfDuL5pXLf5BPANN+8IsGCDp9muVa6AeZthr4UKED1Zv7HITv9brA0gR9nLOMs= X-Gm-Gg: AYBFou0WL9Gzvz8AZN7GvzWJh8ZbzxXbHE1B03E3TkZfU99mbxofSNq4Jpog1PaGbXt /9XW9FdrdVj1YN0sjQKRJ4nbFdz4P2oLfhMIYJ165ORbntUoMxoFDJHO04A5jYly6JFrHGDv0la AqbsPiQ5mcn6dxN0cSOsIeP1jsz5uAm1pQG/b4HGbyR3werMnI8ZcADxk7HS4sZO2j2Asab6zMu 6whUtCXTfV/bLBye+pL3QQquFyI1d7E184d4bQyQn5wjjC7HwU8NjO3ndSuH1m5Wi6p0z9r4oP5 eUAaS9yP1R2CPsOMXE5r7eCqwgs0dbJIqfXN4SwTLbV01fKN3g4CcmKPQzhLn/Ha1G1cCwOcubU PA0W0HKvGYLiX1uT68bw+QbkOBzn6nt7DBYkMfYEB7u4taw+yXWkfCP0b0flcTGXciKMYPN5mRY GroCR8BG/6BZf5KYoh/7DltqJo8bankMtGLWvB+4/vtgiqdcSvFXoJ0x3UsdErsW4de/6MsEdhO pWhcBExrMDifp/1eSAkqccYdprrhLtQyKekSgYB4dHCTgatFFOFhL2PlkpvhyB7JKHMqQU= X-Received: by 2002:a05:7301:701:b0:341:b570:8d75 with SMTP id 5a478bee46e88-34c6605302dmr1125938eec.14.1790730219815; Tue, 29 Sep 2026 18:03:39 -0700 (PDT) Received: from localhost.localdomain ([2603:8001:5f01:8bab:3481:cbb6:f339:9e4e]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-34c386c2723sm2179993eec.18.2026.09.29.18.03.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Sep 2026 18:03:38 -0700 (PDT) From: Artem Dinaburg To: stable@vger.kernel.org Cc: Artem Dinaburg , Greg Kroah-Hartman , Sasha Levin , Suraj Kandpal , Dnyaneshwar Bhadane , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Tvrtko Ursulin , David Airlie , Daniel Vetter , Simona Vetter , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 6.6.y v2 1/2] drm/i915/hdcp: Add encoder check in intel_hdcp_get_capability Date: Tue, 29 Sep 2026 21:03:20 -0400 Message-ID: <20260930010323.93999-2-artem@trailofbits.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930010323.93999-1-artem@trailofbits.com> References: <20260930010323.93999-1-artem@trailofbits.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Wed, 30 Sep 2026 13:48:38 +0000 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Suraj Kandpal [ Upstream commit 31b42af516afa1e184d1a9f9dd4096c54044269a ] Sometimes during hotplug scenario or suspend/resume scenario encoder is not always initialized when intel_hdcp_get_capability add a check to avoid kernel null pointer dereference. [ Backport to 6.6.y: this tree uses the older intel_hdcp_capable() helper name. Apply the same guard there; the code change is otherwise unchanged. ] Signed-off-by: Suraj Kandpal Reviewed-by: Dnyaneshwar Bhadane Link: https://patchwork.freedesktop.org/patch/msgid/20240722064451.3610512-2-suraj.kandpal@intel.com Assisted-by: LLM Signed-off-by: Artem Dinaburg --- CVE: CVE-2024-53051 Upstream: 31b42af516afa1e184d1a9f9dd4096c54044269a Code change unchanged from v1; only the retained backport note was added. v1: https://lore.kernel.org/r/20260929031728.88004-1-artem@trailofbits.com drivers/gpu/drm/i915/display/intel_hdcp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index f377c4484e18..f7987fb90bb1 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -142,11 +142,16 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *dig_port, /* Is HDCP1.4 capable on Platform and Sink */ bool intel_hdcp_capable(struct intel_connector *connector) { - struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct intel_digital_port *dig_port; const struct intel_hdcp_shim *shim = connector->hdcp.shim; bool capable = false; u8 bksv[5]; + if (!intel_attached_encoder(connector)) + return capable; + + dig_port = intel_attached_dig_port(connector); + if (!shim) return capable; -- 2.39.5