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 F16C4183CDD; Thu, 1 Aug 2024 00:28:40 +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=1722472121; cv=none; b=YisXwOVc9dgNteMjFmSNVpfj9vQO/NFg9QSqFuAns5aNvMiP/Co1Kn3yCMGBdOEnh99ufvLpoQ0kKNf3qTpMQddpX36L6zWojeGIusnpVIxlOr3I+GHqM3k2BMMnHDWZVUneZbXU3LxkHDaY79Gddjs7r91rOoDM7/B4xqMq5+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722472121; c=relaxed/simple; bh=moWK3zBre6G0eRnPnELvsX4YXtNh3vXj/AuPP1fg6T4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sobPT/Ly+Gp1XRfIZV7Ib+d1LU3lgVJVLIC3gLZXhC3ztekmw2nRIENbRJYBTJwQ4Qel+iLmANcE1RTL893En7ptzzQurs/KvsHyvOh7LunneOXGZKX5M/vxpgBJK+89qClFoIZabOtd5OuYLD9mknRJyWGdmeyJ3/cg5soSrTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RkfkWNpD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RkfkWNpD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87819C116B1; Thu, 1 Aug 2024 00:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722472120; bh=moWK3zBre6G0eRnPnELvsX4YXtNh3vXj/AuPP1fg6T4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RkfkWNpDYbZstcIEh7HMoiKH8TCznEb4+tPXcUxP4fLOnR7Dum8ZPaCFUYmUbF/nh PDwbcZ76fT8sMZhuAy0U90zPxwX5JQ3WZz6XOwv8Id+k9ZpFTxZlnFEEOf9BR5yxGE uRiJYpkpm5zts+HT4aZEou2aBFUMSVX6nFE6MnJkIkz0hsf/rrRqSJ05nzuiXBfCl9 yvFWRVcIdgTmGknEoAxLUO5sifiwJgDRPAnrVSKjByotvXAzIOqecoH6phONn9Ld1J KNzHxWydVgXTjsry8O14xiWXckJuRK34wmWemLt7kXjXazQi9NhqqMBO0Mw7Y9hjkE M1BaJvD9oKm1A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hersen Wu , Harry Wentland , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alex.hung@amd.com, hamza.mahfooz@amd.com, roman.li@amd.com, mario.limonciello@amd.com, Wayne.Lin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 08/61] drm/amd/display: Stop amdgpu_dm initialize when stream nums greater than 6 Date: Wed, 31 Jul 2024 20:25:26 -0400 Message-ID: <20240801002803.3935985-8-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801002803.3935985-1-sashal@kernel.org> References: <20240801002803.3935985-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.102 Content-Transfer-Encoding: 8bit From: Hersen Wu [ Upstream commit 84723eb6068c50610c5c0893980d230d7afa2105 ] [Why] Coverity reports OVERRUN warning. Should abort amdgpu_dm initialize. [How] Return failure to amdgpu_dm_init. Reviewed-by: Harry Wentland Acked-by: Tom Chung Signed-off-by: Hersen Wu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 31bae620aeffc..160811ac1fb97 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4358,7 +4358,10 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) /* There is one primary plane per CRTC */ primary_planes = dm->dc->caps.max_streams; - ASSERT(primary_planes <= AMDGPU_MAX_PLANES); + if (primary_planes > AMDGPU_MAX_PLANES) { + DRM_ERROR("DM: Plane nums out of 6 planes\n"); + return -EINVAL; + } /* * Initialize primary planes, implicit planes for legacy IOCTLS. -- 2.43.0