iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfio/type1: Fix leak on error path

Browse Source 
We also don't handle unpinning zero pages as an error on other exits
so we can fix that inconsistency by rolling in the next conditional
return.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alex Williamson 2013-07-01 08:28:58 -06:00
parent 6d6768c61b
commit 8d38ef1948
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/vfio/vfio_iommu_type1.c
View File

@ -436,6 +436,12 @@ static int vfio_remove_dma_overlap(struct vfio_iommu *iommu, dma_addr_t start,
} }
/* Split existing */ /* Split existing */
/*
* Allocate our tracking structure early even though it may not
* be used. An Allocation failure later loses track of pages and
* is more difficult to unwind.
*/
split = kzalloc(sizeof(*split), GFP_KERNEL); split = kzalloc(sizeof(*split), GFP_KERNEL);
if (!split) if (!split)
return -ENOMEM; return -ENOMEM;
@ -443,12 +449,9 @@ static int vfio_remove_dma_overlap(struct vfio_iommu *iommu, dma_addr_t start,
offset = start - dma->iova; offset = start - dma->iova;
ret = vfio_unmap_unpin(iommu, dma, start, size); ret = vfio_unmap_unpin(iommu, dma, start, size);
if (ret) if (ret || !*size) {
return ret;
if (!*size) {
kfree(split); kfree(split);
return -EINVAL; return ret;
} }
tmp = dma->size; tmp = dma->size;