Re: [PATCH 04/46] [media] vivid-vid-out: use memdup_user()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 09/03/2014 10:32 PM, Mauro Carvalho Chehab wrote:
> Instead of allocating and coping from __user, do it using
> one atomic call. That makes the code simpler. Also,

Also what?

Anyway, looks good to me:

Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>

Regards,

	Hans

> 
> Found by coccinelle.
> 
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> 
> 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;
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux