diff options
| author | Julia Lawall <julia@diku.dk> | 2010-05-22 10:22:00 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-05-31 18:49:52 +0200 |
| commit | d8c1fa4af0f311363d9f9cf1014b11d31a99ff10 (patch) | |
| tree | eb3bdf02be53c25a94aa7f60286400de9c39ae0c /drivers/ieee1394/video1394.c | |
| parent | 3014420b6b5d0a6483cf5e56c10df180a33e957e (diff) | |
ieee1394: video1394: Use memdup_user
...when user data is immediately copied into the allocated region.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (changelog)
Diffstat (limited to 'drivers/ieee1394/video1394.c')
| -rw-r--r-- | drivers/ieee1394/video1394.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index a42bd6893bc..a77483befcd 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -1045,14 +1045,9 @@ static long video1394_ioctl(struct file *file, if (get_user(qv, &p->packet_sizes)) return -EFAULT; - psizes = kmalloc(buf_size, GFP_KERNEL); - if (!psizes) - return -ENOMEM; - - if (copy_from_user(psizes, qv, buf_size)) { - kfree(psizes); - return -EFAULT; - } + psizes = memdup_user(qv, buf_size); + if (IS_ERR(psizes)) + return PTR_ERR(psizes); } spin_lock_irqsave(&d->lock,flags); |