Skip to contentSkip to conversation

ARM/dma-mapping: use kvzalloc() in __iommu_alloc_buffer()

PATCH Superseded Denis Efremov 2 participants 3 messages Aug 27, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM/dma-mapping: use kvzalloc() in __iommu_alloc_buffer()

Use kvzalloc() in __iommu_alloc_buffer() instead of open-coding it.

---
 arch/arm/mm/dma-mapping.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/mm/dma-mapping.c +1 -4
index 8a8949174b1c..9def10affa70 100644
@@ -1203,10 +1203,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,
 	int i = 0;
 	int order_idx = 0;
 
-	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, GFP_KERNEL);
-	else
-		pages = vzalloc(array_size);
+	pages = kvzalloc(array_size, GFP_KERNEL);
 	if (!pages)
 		return NULL;
 
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/1 ARM/dma-mapping: use kvzalloc() in __iommu_alloc_buffer()

Use kvzalloc() in __iommu_alloc_buffer() instead of open-coding it. Size computation wrapped in array_size() macro to prevent potential integer overflows.

---
Changes in v2:
- array_size() added

 arch/arm/mm/dma-mapping.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
arch/arm/mm/dma-mapping.c +1 -5
index 8a8949174b1c..c1f864ff7b84 100644
@@ -1199,14 +1199,10 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,
 {
 	struct page **pages;
 	int count = size >> PAGE_SHIFT;
-	int array_size = count * sizeof(struct page *);
 	int i = 0;
 	int order_idx = 0;
 
-	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, GFP_KERNEL);
-	else
-		pages = vzalloc(array_size);
+	pages = kvzalloc(array_size(sizeof(*pages), count), GFP_KERNEL);
 	if (!pages)
 		return NULL;
 
Signature · 1 line
2.26.2
#2 lore raw
Quoted 3 lines · Denis Efremov

Use kvzalloc() in __iommu_alloc_buffer() instead of open-coding it. Size computation wrapped in array_size() macro to prevent potential integer overflows.

FWIW I'm currently working on a much more thorough cleanup by way of removing this code entirely [1] ;)

Robin.

[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/

Quoted 29 lines

---
Changes in v2:
- array_size() added

  arch/arm/mm/dma-mapping.c | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
arch/arm/mm/dma-mapping.c +1 -5
index 8a8949174b1c..c1f864ff7b84 100644
@@ -1199,14 +1199,10 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,
  {
  	struct page **pages;
  	int count = size >> PAGE_SHIFT;
-	int array_size = count * sizeof(struct page *);
  	int i = 0;
  	int order_idx = 0;
 
-	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, GFP_KERNEL);
-	else
-		pages = vzalloc(array_size);
+	pages = kvzalloc(array_size(sizeof(*pages), count), GFP_KERNEL);
  	if (!pages)
  		return NULL;