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 8C56A2F5472; Tue, 17 Jun 2025 15:55:21 +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=1750175721; cv=none; b=tjSFuUwIFRIRXLb4XtvZ3mWpK/daBBHYsqwOaDUG67XV4UblwHKet4Cv/vOHLBjlHFy9ZEPBfC0Xe0ImIy3UNa2tzOLd/VS/cMpaXZEPFy+MjiCUBcwSZYvXsIVktgVQJw2h76ZdsojIVV/O04R3MdpL+Kep9seYNp2nmSKIAp8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750175721; c=relaxed/simple; bh=mPVKXHC6dEYJKjjodvfpitiqJdA9Qt6Wsu4YioUek90=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JBEQgKw2uE7inrTiob1RCCwyj0zMpwymZNsM7yrP+eJOnr/mAk1ECL1OFxsA557dM9MsrhLIsn/+QBw53DaNlRn6ZLrunbCUKBLm2/YUZCLgcHC2Q/gbj/Vl5ZYy6yTGNztC4CYkQBmh4YRWo0xOsUCRzN5a6BTEKQsidR4oBjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qwdYX6/v; 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="qwdYX6/v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01A61C4CEE7; Tue, 17 Jun 2025 15:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750175721; bh=mPVKXHC6dEYJKjjodvfpitiqJdA9Qt6Wsu4YioUek90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qwdYX6/vh0tjursFy1iSuHPQcN5pWWsBPMH2yzi9HQSduuCVdTadQExanaPe07rQj ni2+rA/sCrTlMihIn43Txtu2db0exSJQQHLY/yO5CQLbcRhPNYgxCf5CeMhVs+oN4U lPYF+kAgT7qZrkq0dS7gcp8krvEwATlA87D1aXFs= 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.15 098/780] drm/amd/pp: Fix potential NULL pointer dereference in atomctrl_initialize_mc_reg_table Date: Tue, 17 Jun 2025 17:16:46 +0200 Message-ID: <20250617152455.499827538@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 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 6.15-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 4bd92fd782be6..8d40ed0f0e838 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c @@ -143,6 +143,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."); @@ -180,6 +184,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