Skip to contentSkip to conversation

kmalloc() bug in pci-dma.c

PATCH In review Venkatesh Pallipadi 3 participants 3 messages Feb 12, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kmalloc() bug in pci-dma.c

After burning my fingers with a similar mistake in one of the patches that I am working on, I did a quick grep to find out all faulty kmalloc() calls and found this.

dma_declare_coherent_memory() is calling kmalloc with wrong arguments. Attached patch fixes this.

Please apply.

Thanks,
Venki

arch/i386/kernel/pci-dma.c renamed from arch/i386/kernel/pci-dma.c.org +2 -2
@@ -89,11 +89,11 @@ int dma_declare_coherent_memory(struct d
 	if (!mem_base)
 		goto out;
 
-	dev->dma_mem = kmalloc(GFP_KERNEL, sizeof(struct dma_coherent_mem));
+	dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
 	if (!dev->dma_mem)
 		goto out;
 	memset(dev->dma_mem, 0, sizeof(struct dma_coherent_mem));
-	dev->dma_mem->bitmap = kmalloc(GFP_KERNEL, bitmap_size);
+	dev->dma_mem->bitmap = kmalloc(bitmap_size, GFP_KERNEL);
 	if (!dev->dma_mem->bitmap)
 		goto free1_out;
 	memset(dev->dma_mem->bitmap, 0, bitmap_size);
#1 lore raw
Quoted 15 lines · Venkatesh Pallipadi

After burning my fingers with a similar mistake in one of the patches that I am working on, I did a quick grep to find out all faulty kmalloc() calls and found this.

dma_declare_coherent_memory() is calling kmalloc with wrong arguments. Attached patch fixes this.

Please apply.

Thanks,
Venki

Quoted 8 lines

--- linux-2.6.10/arch/i386/kernel/pci-dma.c.org 2005-02-11 15:18:42.596362296 -0800
+++ linux-2.6.10/arch/i386/kernel/pci-dma.c 2005-02-11 15:19:18.446912184 -0800
@@ -89,11 +89,11 @@ int dma_declare_coherent_memory(struct d
if (!mem_base)
goto out;

- dev->dma_mem = kmalloc(GFP_KERNEL, sizeof(struct dma_coherent_mem));
+ dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);

erp. I'll add that to the 2.6.11 queue, thanks.

#2 lore raw
In reply to Venkatesh Pallipadi
Quoted 6 lines · Venkatesh Pallipadi

After burning my fingers with a similar mistake in one of the patches that I am working on, I did a quick grep to find out all faulty kmalloc() calls and found this.

dma_declare_coherent_memory() is calling kmalloc with wrong arguments. Attached patch fixes this.

Oh Wow, did I really do that ... brown paper bag time for me, I suppose.

Quoted 1 line

Please apply.

Andrew, please put it in.

James