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 E36AC14A08E; Thu, 5 Sep 2024 09:47:18 +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=1725529639; cv=none; b=B/RWrIwBackZOPEHg4cvDNNqV7ymkO56b1Qc9yFq1BcnIK69tZqiLAWxo8siQq6FbRQzb887nLQJWSTOK7UPmtjIglnHch2eYl3GCEJqJwwg8XNLmNXULhy0b6kXCMZ3dcI6zoxuLgES7d/X9RrhxQliKGsXvhWIIwqEDgzuL4M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725529639; c=relaxed/simple; bh=snFwZ36KhkJeu69n/yQQRn9FehqMPaIm14taKoFpXwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PlcXZwkw4vbf8PaGesSXmyGpbEuuUkTNNYbboA7WE1Jkm7vqepgfZC+my/sPMNPtgJ9ESJeZiPiSQ7+Z/tPJkGf0W466MN8+OOEFjEFkWQI7d4dXuaLzrHH6ZwvR6318L/QsopvPkH0NMT1CLTnFAhTYXvukPSaGE993wrgE/Yk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aJ3rwaj6; 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="aJ3rwaj6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 663BDC4CEC3; Thu, 5 Sep 2024 09:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725529638; bh=snFwZ36KhkJeu69n/yQQRn9FehqMPaIm14taKoFpXwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aJ3rwaj6zokNhaSjH9T6bYfzYPsZ8RD8/c6idU+HUbvlTuiQnPyd23AvoTQCsBTEv sVdxroSw/6jaTmHNsw42b2MfAWrvxF+AGsxM76hX6qTOevoQym7ejq2pR7Vd5jCqQg Ds1HN1aP0WXJsaeVgU0h1AIc4ogdEXkU+XbKeZg8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Harry Wentland , Tom Chung , Alex Hung , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 6.10 065/184] drm/amd/display: Check num_valid_sets before accessing reader_wm_sets[] Date: Thu, 5 Sep 2024 11:39:38 +0200 Message-ID: <20240905093734.777428617@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240905093732.239411633@linuxfoundation.org> References: <20240905093732.239411633@linuxfoundation.org> User-Agent: quilt/0.67 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.10-stable review patch. If anyone has any objections, please let me know. ------------------ 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 5ef0879f6ad9..aea4bb46856e 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