linux-kernel - [PATCH v3] drm/amdgpu: Fix the memory allocation issue in amdgpu_discovery_get_nps

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241029202758.2764535-1-lihuafei1@huawei.com>
Date: Wed, 30 Oct 2024 04:27:58 +0800
From: Li Huafei <lihuafei1@...wei.com>
To: <alexander.deucher@....com>, <lijo.lazar@....com>,
	<christophe.jaillet@...adoo.fr>
CC: <christian.koenig@....com>, <Xinhui.Pan@....com>, <airlied@...il.com>,
	<simona@...ll.ch>, <Hawking.Zhang@....com>, <yifan1.zhang@....com>,
	<Likun.Gao@....com>, <Tim.Huang@....com>, <pratap.nirujogi@....com>,
	<victorchengchi.lu@....com>, <Jun.Ma2@....com>, <le.ma@....com>,
	<amd-gfx@...ts.freedesktop.org>, <dri-devel@...ts.freedesktop.org>,
	<linux-kernel@...r.kernel.org>, <lihuafei1@...wei.com>
Subject: [PATCH v3] drm/amdgpu: Fix the memory allocation issue in amdgpu_discovery_get_nps_info()

Fix two issues with memory allocation in amdgpu_discovery_get_nps_info()
for mem_ranges:

 - Add a check for allocation failure to avoid dereferencing a null
   pointer.

 - As suggested by Christophe, use kvcalloc() for memory allocation,
   which checks for multiplication overflow.

Additionally, assign the output parameters nps_type and range_cnt after
the kvcalloc() call to prevent modifying the output parameters in case
of an error return.

Fixes: b194d21b9bcc ("drm/amdgpu: Use NPS ranges from discovery table")
Suggested-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
Reviewed-by: Lijo Lazar <lijo.lazar@....com>
Signed-off-by: Li Huafei <lihuafei1@...wei.com>
---
Changes in v3: 
 - As suggested by Christophe, replace kvzalloc() with kvcalloc()
 - Link to v2: https://lore.kernel.org/lkml/20241029101839.2605713-1-lihuafei1@huawei.com/

Changes in v2:
 - kvzalloc() call uses 'nps_info->v1.count' instead of '*range_cnt'
 - Link to v1: https://lore.kernel.org/lkml/20241028215933.2599271-1-lihuafei1@huawei.com/
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 4bd61c169ca8..620090f092ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1757,11 +1757,13 @@ int amdgpu_discovery_get_nps_info(struct amdgpu_device *adev,
 
 	switch (le16_to_cpu(nps_info->v1.header.version_major)) {
 	case 1:
+		mem_ranges = kvcalloc(nps_info->v1.count,
+				      sizeof(struct amdgpu_gmc_memrange),
+				      GFP_KERNEL);
+		if (!mem_ranges)
+			return -ENOMEM;
 		*nps_type = nps_info->v1.nps_type;
 		*range_cnt = nps_info->v1.count;
-		mem_ranges = kvzalloc(
-			*range_cnt * sizeof(struct amdgpu_gmc_memrange),
-			GFP_KERNEL);
 		for (i = 0; i < *range_cnt; i++) {
 			mem_ranges[i].base_address =
 				nps_info->v1.instance_info[i].base_address;
-- 
2.25.1