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 0283017A589; Tue, 10 Sep 2024 10:15:30 +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=1725963330; cv=none; b=pTLe2N5Ilv1ey8XwQyEPi9+eVbsyzMZqjbFoZf3cJEgf/MeaBEAaeaZ90IVloU+JfjTOt5FrqNoklG/E1DAVDIkGcp2J/xEHnKDHyNOdMGvSHwws4CXJsdO+MYyB17xm8BsDo7sIvAgb9cjqyAtoqMSFXgKYOlaqR47lgTjFgMc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963330; c=relaxed/simple; bh=uv97zgx3nEuOxbYK2M9jO5scRgemrY8XsRSFYNMmam8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VnPIQSmwuMMGEzqfSHVHGeYt73CQ+7Xy3ZMscoG0F4aB84KzcIh9qXvtHY/bTsSB0jH34PRXzLK61TOxfTLz7wWkF5v+HCEXqHrEM3M7YAbvM2bmgmniGTTq7ABpaZ3gml77vHp2QvfsCORkZO6pZuVgNQYf5QNYtsZUsJ+rZ9Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=j7/NbmSA; 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="j7/NbmSA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FD29C4CECD; Tue, 10 Sep 2024 10:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725963329; bh=uv97zgx3nEuOxbYK2M9jO5scRgemrY8XsRSFYNMmam8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j7/NbmSASEPxDcjEBMYd5P776M/QyNlWFB9yeF7Keje/T8TyiW7VvhhSmNJ5P3JHy qO9R5KCvFCqHhohEgUChvyke4fKIrPavCDqwjtYLPXhVl9bnm88Xce/adLMnQWORwj AQ4Tqh+LX6lJIoKiwqLDloxgronKb3jIQPK+ThNM= 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 5.15 020/214] drm/amd/display: Check num_valid_sets before accessing reader_wm_sets[] Date: Tue, 10 Sep 2024 11:30:42 +0200 Message-ID: <20240910092559.603124741@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092558.714365667@linuxfoundation.org> References: <20240910092558.714365667@linuxfoundation.org> User-Agent: quilt/0.67 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 5.15-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 6185f9475fa2..afce8f3bc67a 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 @@ -489,7 +489,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