From nobody Sat Feb 7 05:00:49 2026 Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) (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 45C8A2F44; Tue, 8 Apr 2025 00:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.178.238 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744073984; cv=none; b=kaFXigp8K2MIbU+W6nQVn4AGf6+3ICcrvkEivKxk9ooMWLIewNZaExBuncObbqW2XOmoUrbwgJOucjssr9g0wzaS5PIdzsJMOa7U0T4XQIwpw49hHI2rdc2d8xmjZ7KrxBsu1AFM7gWdRHGcHcVwDsRglUPKBIUwAntuUUu7jVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744073984; c=relaxed/simple; bh=530cCthsBxJGAnh29VV+3qHeJI8/he7x9Z7tJ7Ive7Y=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=EtZhaYvq0s+RX5V+s7yBMWQxPpaFumdyD/4fOcnDen1tgAKJ25OpawLUSz1bYqwvo2NkkwaDvkGtqctb8PPcOp6gOK8YoV/cy9+9K6JBgVvrrAiNy9ivWtBLTmHWlFSLKZQzIHRUroFneZ2RDjOwL1JqZjU6SJyKQkplQBMSR4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=windriver.com; spf=pass smtp.mailfrom=windriver.com; arc=none smtp.client-ip=205.220.178.238 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=windriver.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=windriver.com Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5380R3sF032020; Tue, 8 Apr 2025 00:59:23 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tug8k4ch-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 08 Apr 2025 00:59:23 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Mon, 7 Apr 2025 17:59:21 -0700 Received: from pek-lpg-core1.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Mon, 7 Apr 2025 17:59:17 -0700 From: To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH 5.10.y] drm/amd/pm: Fix negative array index read Date: Tue, 8 Apr 2025 08:59:16 +0800 Message-ID: <20250408005916.3362084-1-jianqi.ren.cn@windriver.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 7PQuZLHbPOKsCVgyxeGy_nUbdk4xh-_p X-Authority-Analysis: v=2.4 cv=YJefyQGx c=1 sm=1 tr=0 ts=67f474eb cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=XR8D0OoHHMoA:10 a=zd2uoN0lAAAA:8 a=t7CeM3EgAAAA:8 a=U7fDvu6cvwUxRHWrC4cA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: 7PQuZLHbPOKsCVgyxeGy_nUbdk4xh-_p X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_07,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1011 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504080005 Content-Type: text/plain; charset="utf-8" From: Jesse Zhang [ Upstream commit c8c19ebf7c0b202a6a2d37a52ca112432723db5f ] Avoid using the negative values for clk_idex as an index into an array pptable->DpmDescriptor. V2: fix clk_index return check (Tim Huang) Signed-off-by: Jesse Zhang Reviewed-by: Tim Huang Signed-off-by: Alex Deucher [Minor conflict resolved due to code context change.] Signed-off-by: Jianqi Ren Signed-off-by: He Zhe --- Verified the build test --- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/= drm/amd/pm/swsmu/smu11/navi10_ppt.c index a7773b6453d5..0af9ee3a520a 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c @@ -900,19 +900,22 @@ static int navi10_get_current_clk_freq_by_table(struc= t smu_context *smu, value); } =20 -static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu, en= um smu_clk_type clk_type) +static int navi10_is_support_fine_grained_dpm(struct smu_context *smu, enu= m smu_clk_type clk_type) { PPTable_t *pptable =3D smu->smu_table.driver_pptable; DpmDescriptor_t *dpm_desc =3D NULL; - uint32_t clk_index =3D 0; + int clk_index =3D 0; =20 clk_index =3D smu_cmn_to_asic_specific_index(smu, CMN2ASIC_MAPPING_CLK, clk_type); + if (clk_index < 0) + return clk_index; + dpm_desc =3D &pptable->DpmDescriptor[clk_index]; =20 /* 0 - Fine grained DPM, 1 - Discrete DPM */ - return dpm_desc->SnapToDiscrete =3D=3D 0 ? true : false; + return dpm_desc->SnapToDiscrete =3D=3D 0 ? 1 : 0; } =20 static inline bool navi10_od_feature_is_supported(struct smu_11_0_overdriv= e_table *od_table, enum SMU_11_0_ODFEATURE_CAP cap) @@ -964,7 +967,11 @@ static int navi10_print_clk_levels(struct smu_context = *smu, if (ret) return size; =20 - if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) { + ret =3D navi10_is_support_fine_grained_dpm(smu, clk_type); + if (ret < 0) + return ret; + + if (!ret) { for (i =3D 0; i < count; i++) { ret =3D smu_v11_0_get_dpm_freq_by_index(smu, clk_type, i, &value); if (ret) @@ -1127,7 +1134,11 @@ static int navi10_force_clk_levels(struct smu_contex= t *smu, case SMU_UCLK: case SMU_FCLK: /* There is only 2 levels for fine grained DPM */ - if (navi10_is_support_fine_grained_dpm(smu, clk_type)) { + ret =3D navi10_is_support_fine_grained_dpm(smu, clk_type); + if (ret < 0) + return ret; + + if (ret) { soft_max_level =3D (soft_max_level >=3D 1 ? 1 : 0); soft_min_level =3D (soft_min_level >=3D 1 ? 1 : 0); } --=20 2.34.1