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 842621494B3; Thu, 1 Aug 2024 00:28:50 +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=1722472130; cv=none; b=bPdvnxq3xj0BD4iQP5Rgq22eeIYodPmYYR0VT5T5qraab/OJzwXg11Y7sgjzCrTPpkMtU1iSoMqAnpxXtVysSBXvxJw8XjjkIl0qfbkEHp+n/dvmS1DtWLzFIPkE/lGj/1brrJNYvl5QpyZcqbyUZg/cUSL0Bh1NoDlMB3xXr0Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722472130; c=relaxed/simple; bh=L8Xma+h3V94GKU055rxkhkr83KmDhxy/LgrjyhjClUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Omt2Miv5djXiyIMN4jZ0STuxFIWiRaqq9VjpumWynRI4hVfXCW4TXllZqZCphvXmwrcU5NXB/6p8Vc7kCywzBiBQ7JBq3SzjQHiEKDSwRc0Mck8WgMLCV+IAogaxoWcSHM6wa8dqDLY5ZrpVMj1c0GMIA7K/Cya9ktOhLbiFpUI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QbLJN5ED; 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="QbLJN5ED" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C195C32786; Thu, 1 Aug 2024 00:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722472130; bh=L8Xma+h3V94GKU055rxkhkr83KmDhxy/LgrjyhjClUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QbLJN5EDNGmIpIO/wY0c+aJNA/Gj18zI70KDFqBtj7PelxZvznL3AxNJ83vKDvevi 9m55nomHqpkGFS/JKi8LgRgoNXZUbO7pxGqpQ3Ei3niXo5qKVgm8fo4Vqd1noiLzMG BzstsOJM13ubzGR24P6ung2z14/5rLolR1jlDFFWcglt4pnC0vj4K99ROsulc14M2+ Z5pTYpUwIN/exNrZ5bvQ2y4cSMAXkUn/Pnf2PuJO24HmqccLVndztgCQ9spcLFahqA UgROMOxLykxHPAhIfC3TZvUqrV6qf+w9Ud/RbUfDZWs5YGj1QOpau50GEB2Waq8ijM W/fVWWuSJIz6g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Hung , 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, roman.li@amd.com, hamza.mahfooz@amd.com, joshua.aberback@amd.com, aric.cyr@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 10/61] drm/amd/display: Check num_valid_sets before accessing reader_wm_sets[] Date: Wed, 31 Jul 2024 20:25:28 -0400 Message-ID: <20240801002803.3935985-10-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: Alex Hung [ Upstream commit b38a4815f79b87efb196cd5121579fc51e29a7fb ] [WHY & HOW] num_valid_sets needs to be checked to avoid a negative index when accessing reader_wm_sets[num_valid_sets - 1]. This fixes an OVERRUN issue reported by Coverity. Reviewed-by: Harry Wentland Acked-by: Tom Chung Signed-off-by: Alex Hung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c index ca6dfd2d7561f..35386011c56c8 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c @@ -484,7 +484,8 @@ static void build_watermark_ranges(struct clk_bw_params *bw_params, struct pp_sm ranges->reader_wm_sets[num_valid_sets].max_fill_clk_mhz = PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MAX; /* Modify previous watermark range to cover up to max */ - ranges->reader_wm_sets[num_valid_sets - 1].max_fill_clk_mhz = PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MAX; + if (num_valid_sets > 0) + ranges->reader_wm_sets[num_valid_sets - 1].max_fill_clk_mhz = PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MAX; } num_valid_sets++; } -- 2.43.0