2011-04-29 22:06:05

by Alex Williamson

Subject: [PATCH] vfio: Fix free in dma mapping error path

This is allocated via vmalloc, so needs vfree, not kfree.

Signed-off-by: Alex Williamson <[email protected]>
---

drivers/vfio/vfio_dma.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/vfio/vfio_dma.c b/drivers/vfio/vfio_dma.c
index cee1a25..4a488b6 100644
--- a/drivers/vfio/vfio_dma.c
+++ b/drivers/vfio/vfio_dma.c
@@ -322,7 +322,7 @@ int vfio_dma_map_common(struct vfio_listener *listener,
if (ret != npage) {
printk(KERN_ERR "%s: get_user_pages_fast returns %d, not %d\n",
__func__, ret, npage);
- kfree(pages);
+ vfree(pages);
ret = -EFAULT;
goto out_lock;
}

2011-05-04 19:18:22

by Tom Lyon

Subject: Re: [PATCH] vfio: Fix free in dma mapping error path

On Friday, April 29, 2011 03:05:54 pm Alex Williamson wrote:
> This is allocated via vmalloc, so needs vfree, not kfree.
>
> Signed-off-by: Alex Williamson <[email protected]>
> ---
>
> drivers/vfio/vfio_dma.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/vfio/vfio_dma.c b/drivers/vfio/vfio_dma.c
> index cee1a25..4a488b6 100644
> --- a/drivers/vfio/vfio_dma.c
> +++ b/drivers/vfio/vfio_dma.c
> @@ -322,7 +322,7 @@ int vfio_dma_map_common(struct vfio_listener *listener,
> if (ret != npage) {
> printk(KERN_ERR "%s: get_user_pages_fast returns %d, not %d\n",
> __func__, ret, npage);
> - kfree(pages);
> + vfree(pages);
> ret = -EFAULT;
> goto out_lock;
> }
Applied. Thanks.