Instead of allocating and coping from __user, do it using one atomic call. That makes the code simpler. Also,
Found by coccinelle. Signed-off-by: Mauro Carvalho Chehab <[email protected]> diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index c983461f29d5..8ed9f6d9f505 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -897,14 +897,10 @@ int vidioc_s_fmt_vid_out_overlay(struct file *file, void *priv, return ret; if (win->bitmap) { - new_bitmap = kzalloc(bitmap_size, GFP_KERNEL); + new_bitmap = memdup_user(win->bitmap, bitmap_size); - if (new_bitmap == NULL) - return -ENOMEM; - if (copy_from_user(new_bitmap, win->bitmap, bitmap_size)) { - kfree(new_bitmap); - return -EFAULT; - } + if (IS_ERR(new_bitmap)) + return PTR_ERR(new_bitmap); } dev->overlay_out_top = win->w.top; -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
