diff options
author | Fengguang Wu <fengguang.wu@intel.com> | 2012-12-07 21:43:49 +0100 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2012-12-07 21:43:49 +0100 |
commit | 3a1f7041ddd59ec3aceb042892f811cc76e05288 (patch) | |
tree | 6e5e3548698eb68a5fdd15864e0190c1dedac164 /drivers/vfio | |
parent | Merge tag 'mmc-fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-3a1f7041ddd59ec3aceb042892f811cc76e05288.tar.xz linux-3a1f7041ddd59ec3aceb042892f811cc76e05288.zip |
vfio: simplify kmalloc+copy_from_user to memdup_user
Generated by: coccinelle/api/memdup_user.cocci
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 6c119944bbb6..a4dc21b9cb06 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -327,15 +327,10 @@ static long vfio_pci_ioctl(void *device_data, hdr.count > vfio_pci_get_irq_count(vdev, hdr.index)) return -EINVAL; - data = kmalloc(hdr.count * size, GFP_KERNEL); - if (!data) - return -ENOMEM; - - if (copy_from_user(data, (void __user *)(arg + minsz), - hdr.count * size)) { - kfree(data); - return -EFAULT; - } + data = memdup_user((void __user *)(arg + minsz), + hdr.count * size); + if (IS_ERR(data)) + return PTR_ERR(data); } mutex_lock(&vdev->igate); |