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 BF4A120CCCA; Tue, 26 Aug 2025 13:32:13 +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=1756215133; cv=none; b=SajnYnNLhh5PvEzggwOTTi3/VbJTCvstEq/QBsWzSzOzhmKwOxtWOEDVaITh4DiKTLxEOa4FTASU48BKlgvAAS62T2f+VaAKkZ8+4pVvBONj4xyV+J3n0tqi5/8mjuZnmca0unkkHpXJSW5MIbk2ZKoeHhWDlxrFmi6ZY9RSdBA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756215133; c=relaxed/simple; bh=1+XFc0pIx5Aiv1xYlcEPSAMhq0k/pQdxpAvPBTmFKuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vaz49NM1wQvwhzSrsi5CaCdWypGasT/s2ccgSMLfxlMFfupA7tSljYOEsw9FOXbQOhdfOlAXrLaI956EcJblyJfztKg6YT7SSaew3cXIhB1kSMnjkoHWkErCg3mxcv+g7+zYwSkYYjCnxtYhi7CMvxX0YXLvtzuodJR6qEFq6Ns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=02ie1Z79; 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="02ie1Z79" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CD67C4CEF1; Tue, 26 Aug 2025 13:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756215133; bh=1+XFc0pIx5Aiv1xYlcEPSAMhq0k/pQdxpAvPBTmFKuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=02ie1Z79VNY/bHBMRrb7V5P0rvUBfn3BHO/2sdxJrf3TAJJTY0NTvN+DlDc3dAilI zMCXZPGBUaojr+TK4hvNO5x09PaguQAe6apiGy7RESn8inXp0AXcqkgEOgYY0ZOVvl RqdwBc8oMNvWhZLGiSvcRNXJ7Pa/8H88FJ5bjtWE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Alex Deucher , Harry Wentland , Alex Hung , Dan Wheeler Subject: [PATCH 6.1 400/482] drm/amd/display: Avoid a NULL pointer dereference Date: Tue, 26 Aug 2025 13:10:53 +0200 Message-ID: <20250826110940.709805095@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Mario Limonciello commit 07b93a5704b0b72002f0c4bd1076214af67dc661 upstream. [WHY] Although unlikely drm_atomic_get_new_connector_state() or drm_atomic_get_old_connector_state() can return NULL. [HOW] Check returns before dereference. Cc: Mario Limonciello Cc: Alex Deucher Reviewed-by: Harry Wentland Signed-off-by: Mario Limonciello Signed-off-by: Alex Hung Tested-by: Dan Wheeler Signed-off-by: Alex Deucher (cherry picked from commit 1e5e8d672fec9f2ab352be121be971877bff2af9) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6620,6 +6620,9 @@ amdgpu_dm_connector_atomic_check(struct struct amdgpu_dm_connector *aconn = to_amdgpu_dm_connector(conn); int ret; + if (WARN_ON(unlikely(!old_con_state || !new_con_state))) + return -EINVAL; + trace_amdgpu_dm_connector_atomic_check(new_con_state); if (conn->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {