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 EFC53279345; Wed, 23 Apr 2025 15:31:41 +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=1745422302; cv=none; b=ptWQ9Z+IR2+TRMU4eMFbdPmCrgy3qh4vR4qvi1Ij8VpXPwLqN326TT2kHHwl4O2Fuxpc1UiDueAPdB9VIFmGTO/DxpGIKs5StTuh21CmCMwlbpQh8t8/oRKD/v148LSlo/aZLjMC7ZVBbdU3OKtnQplM63ZMNmbPI2lDmbQEjM4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745422302; c=relaxed/simple; bh=xwFeZe3Du8pq/LMKx34xCQvs7cTX6FrlDf0/zOH9BZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ayB/5BXJI1hy61cimTaNSJoFnEpg96CIp9LZ2dAo5TA8+kpsi1dx9ZwuUXSVth6E4KH8xTFJA9P4gJdhgzELYJvmuf1405KZCBCJRPuViPUwkTKTbqcjJ6KIjIIRbTIrv4UawEWv+NrMNtWBIPU1+2vkGB/RLAKWjZ1F3uA/eYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RR3C5gjz; 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="RR3C5gjz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 217AFC4CEE2; Wed, 23 Apr 2025 15:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745422301; bh=xwFeZe3Du8pq/LMKx34xCQvs7cTX6FrlDf0/zOH9BZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RR3C5gjzQR3CpyKzD1JE7WqqdigSaX5ZOCvzCieIAZKpqF/1KMuSBbawutCYeSObt QHtJ8VYnkRdDeGCfoJ7nfKQIWMPTlpEJPiNcLlaFZxbiw4fJ7pK4Fl3Dof3HeXLeug WdmXl4Xx0cM7SI55XvoyEZUQZoXXu58jOwSeeyv0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Harry Wentland , Tom Chung , Hersen Wu , Daniel Wheeler , Alex Deucher , Jianqi Ren , He Zhe Subject: [PATCH 6.1 273/291] drm/amd/display: Stop amdgpu_dm initialize when link nums greater than max_links Date: Wed, 23 Apr 2025 16:44:22 +0200 Message-ID: <20250423142635.587608878@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142624.409452181@linuxfoundation.org> References: <20250423142624.409452181@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Hersen Wu commit cf8b16857db702ceb8d52f9219a4613363e2b1cf upstream. [Why] Coverity report OVERRUN warning. There are only max_links elements within dc->links. link count could up to AMDGPU_DM_MAX_DISPLAY_INDEX 31. [How] Make sure link count less than max_links. Reviewed-by: Harry Wentland Acked-by: Tom Chung Signed-off-by: Hersen Wu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher [Minor conflict resolved due to code context change. And the macro MAX_LINKS is introduced by Commit 60df5628144b ("drm/amd/display: handle invalid connector indices") after 6.10. So here we still use the original array length MAX_PIPES * 2] Signed-off-by: Jianqi Ren Signed-off-by: He Zhe Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4499,17 +4499,17 @@ static int amdgpu_dm_initialize_drm_devi } } + if (link_cnt > (MAX_PIPES * 2)) { + DRM_ERROR( + "KMS: Cannot support more than %d display indexes\n", + MAX_PIPES * 2); + goto fail; + } + /* loops over all connectors on the board */ for (i = 0; i < link_cnt; i++) { struct dc_link *link = NULL; - if (i > AMDGPU_DM_MAX_DISPLAY_INDEX) { - DRM_ERROR( - "KMS: Cannot support more than %d display indexes\n", - AMDGPU_DM_MAX_DISPLAY_INDEX); - continue; - } - aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL); if (!aconnector) goto fail;