Commit 9329e7b0 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

media: vivid: potential integer overflow in vidioc_g_edid()

If we pick a very large "edid->blocks" value then the "edid->start_block
+ edid->blocks" addition could wrap around.

Fixes: ef834f78 ("[media] vivid: add the video capture and output parts")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a3d71f25
...@@ -860,7 +860,7 @@ int vidioc_g_edid(struct file *file, void *_fh, ...@@ -860,7 +860,7 @@ int vidioc_g_edid(struct file *file, void *_fh,
return -ENODATA; return -ENODATA;
if (edid->start_block >= dev->edid_blocks) if (edid->start_block >= dev->edid_blocks)
return -EINVAL; return -EINVAL;
if (edid->start_block + edid->blocks > dev->edid_blocks) if (edid->blocks > dev->edid_blocks - edid->start_block)
edid->blocks = dev->edid_blocks - edid->start_block; edid->blocks = dev->edid_blocks - edid->start_block;
if (adap) if (adap)
cec_set_edid_phys_addr(dev->edid, dev->edid_blocks * 128, adap->phys_addr); cec_set_edid_phys_addr(dev->edid, dev->edid_blocks * 128, adap->phys_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment