aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-22 04:22:00 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-05-31 12:49:52 -0400
commitd8c1fa4af0f311363d9f9cf1014b11d31a99ff10 (patch)
treeeb3bdf02be53c25a94aa7f60286400de9c39ae0c /drivers
parent3014420b6b5d0a6483cf5e56c10df180a33e957e (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')
-rw-r--r--drivers/ieee1394/video1394.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index a42bd6893bcf..a77483befcda 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1045,14 +1045,9 @@ static long video1394_ioctl(struct file *file,
1045 if (get_user(qv, &p->packet_sizes)) 1045 if (get_user(qv, &p->packet_sizes))
1046 return -EFAULT; 1046 return -EFAULT;
1047 1047
1048 psizes = kmalloc(buf_size, GFP_KERNEL); 1048 psizes = memdup_user(qv, buf_size);
1049 if (!psizes) 1049 if (IS_ERR(psizes))
1050 return -ENOMEM; 1050 return PTR_ERR(psizes);
1051
1052 if (copy_from_user(psizes, qv, buf_size)) {
1053 kfree(psizes);
1054 return -EFAULT;
1055 }
1056 } 1051 }
1057 1052
1058 spin_lock_irqsave(&d->lock,flags); 1053 spin_lock_irqsave(&d->lock,flags);