Merge branch 'topic/memdup_user' into for-linus

* topic/memdup_user:
  ALSA: sound/pci: use memdup_user()
  ALSA: sound/usb: use memdup_user()
  ALSA: sound/isa: use memdup_user()
  ALSA: sound/core: use memdup_user()

1 files changed, 5 insertions, 9 deletions

diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index a4345fc07561..2bb1cee09255 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -202,15 +202,11 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
                                             "> 512 bytes to FX\n");
                                 return -EIO;
                         }
-                        page_data = kmalloc(r.data[2] * sizeof(short), GFP_KERNEL);
-                        if (!page_data)
-                                return -ENOMEM;
-                        if (copy_from_user (page_data,
-                                            (unsigned char __user *) r.data[3],
-                                            r.data[2] * sizeof(short))) {
-                                kfree(page_data);
-                                return -EFAULT;
-                        }
+                        page_data = memdup_user((unsigned char __user *)
+                                                r.data[3],
+                                                r.data[2] * sizeof(short));
+                        if (IS_ERR(page_data))
+                                return PTR_ERR(page_data);
                         pd = page_data;
                 }