]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
NVMe: Fix memory leak in nvme_dev_add()
authorMatthew Wilcox <matthew.r.wilcox@intel.com>
Mon, 19 Sep 2011 21:14:53 +0000 (17:14 -0400)
committerMatthew Wilcox <matthew.r.wilcox@intel.com>
Fri, 4 Nov 2011 19:53:04 +0000 (15:53 -0400)
The driver was allocating 8k of memory, then freeing 4k of it.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
drivers/block/nvme.c

index a7f82fbdaf87a4f75605e4ecb3942148b5f4b2f6..705f66ebd15f129a08ca7d53b917d7017077712b 100644 (file)
@@ -1457,7 +1457,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
        list_for_each_entry(ns, &dev->namespaces, list)
                add_disk(ns->disk);
 
-       dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr);
+       dma_free_coherent(&dev->pci_dev->dev, 8192, id, dma_addr);
        return 0;
 
  out_free:
@@ -1466,7 +1466,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
                nvme_ns_free(ns);
        }
 
-       dma_free_coherent(&dev->pci_dev->dev, 4096, id, dma_addr);
+       dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr);
        return res;
 }