From: Hans Verkuil Date: Tue, 2 Oct 2012 05:47:58 +0000 (-0300) Subject: [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b8b10cc7e6bd9bf017c58e32b1e7f632e23850d;p=linux-beck.git [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID The maximum size of an EDID is 32768 bytes, which is 32768 / 128 = 256 blocks. Return -EINVAL if blocks > 256 to ensure that the memory allocation is sane. Signed-off-by: Hans Verkuil Reported-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 16205d9bddfc..11874c170cbe 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -2212,6 +2212,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, struct v4l2_subdev_edid *edid = parg; if (edid->blocks) { + if (edid->blocks > 256) { + ret = -EINVAL; + break; + } *user_ptr = (void __user *)edid->edid; *kernel_ptr = (void *)&edid->edid; *array_size = edid->blocks * 128;