Skip to content

Commit

Permalink
ieee1394: video1394: Use memdup_user
Browse files Browse the repository at this point in the history
...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)
  • Loading branch information
Julia Lawall authored and Stefan Richter committed May 31, 2010
1 parent 3014420 commit d8c1fa4
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/ieee1394/video1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d8c1fa4

Please sign in to comment.