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 178842E9753; Tue, 17 Jun 2025 15:40:27 +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=1750174827; cv=none; b=pqPDENvdUDq5VB2zcLxOGDGayhFny6RzZ0p9/I0NAvVA6vPKwAc2jWgrDeQp50UQ7Wv3Mj6lcTgtEBO9bjhfWUVBFBxqJQIv9Ns3M3EcBIKdt9IBh/3VY8qe/10YwSSy+lFKUcnwyAOixTYnCTTlX7kdaqc6oHjwJV1MEzvPyT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750174827; c=relaxed/simple; bh=XVWQ/TWRkxOiisminme+dVf9lzMEinWz6B+Ki8Z1Kd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E/yaZmz47KDsPBSr5OFD+qjJcrhmpN8TtQsHW3VEoFY7bsdtR2WSQSx+3Lio77UPfbYbOeX+iQKHIpaUnP8mvU8aHbpkgdTHg6l6f+zemIfW/HGoWYE/hweJUm4WzhcqTrkWA6quQ45sKnHBoVKU5yXEMf3UA8Q/xfgKpxMTdcM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wg7+zM2X; 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="wg7+zM2X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81ECAC4CEE3; Tue, 17 Jun 2025 15:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750174827; bh=XVWQ/TWRkxOiisminme+dVf9lzMEinWz6B+Ki8Z1Kd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wg7+zM2XTO+omNcEvyCERLvyeiUy/CiGz1YfwubHvdcljg3QvYgGFCbxILDZ2j33n IBK1EAUOztsVGqmxT5ASs7205WW+/WUnGyctRskHPMJg+nC35Km3wtdWdl4I8c0aD5 QcuptQqHKq6MOw27U6+lz1/PV2tZ6ecQ8G2PPOE0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Charles Han , Alex Deucher , Sasha Levin Subject: [PATCH 6.12 064/512] drm/amd/pp: Fix potential NULL pointer dereference in atomctrl_initialize_mc_reg_table Date: Tue, 17 Jun 2025 17:20:30 +0200 Message-ID: <20250617152422.175422044@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152419.512865572@linuxfoundation.org> References: <20250617152419.512865572@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Charles Han [ Upstream commit 820116a39f96bdc7d426c33a804b52f53700a919 ] The function atomctrl_initialize_mc_reg_table() and atomctrl_initialize_mc_reg_table_v2_2() does not check the return value of smu_atom_get_data_table(). If smu_atom_get_data_table() fails to retrieve vram_info, it returns NULL which is later dereferenced. Fixes: b3892e2bb519 ("drm/amd/pp: Use atombios api directly in powerplay (v2)") Fixes: 5f92b48cf62c ("drm/amd/pm: add mc register table initialization") Signed-off-by: Charles Han Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c index 5c54c9fd44619..a76fc15a55f5b 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c @@ -144,6 +144,10 @@ int atomctrl_initialize_mc_reg_table( vram_info = (ATOM_VRAM_INFO_HEADER_V2_1 *) smu_atom_get_data_table(hwmgr->adev, GetIndexIntoMasterTable(DATA, VRAM_Info), &size, &frev, &crev); + if (!vram_info) { + pr_err("Could not retrieve the VramInfo table!"); + return -EINVAL; + } if (module_index >= vram_info->ucNumOfVRAMModule) { pr_err("Invalid VramInfo table."); @@ -181,6 +185,10 @@ int atomctrl_initialize_mc_reg_table_v2_2( vram_info = (ATOM_VRAM_INFO_HEADER_V2_2 *) smu_atom_get_data_table(hwmgr->adev, GetIndexIntoMasterTable(DATA, VRAM_Info), &size, &frev, &crev); + if (!vram_info) { + pr_err("Could not retrieve the VramInfo table!"); + return -EINVAL; + } if (module_index >= vram_info->ucNumOfVRAMModule) { pr_err("Invalid VramInfo table."); -- 2.39.5