leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: vivid: potential integer overflow in vidioc_g_edid()

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

Fixes: ef834f7836 ("[media] vivid: add the video capture and output parts")

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dan Carpenter 2018-05-17 04:58:25 -04:00 committed by Mauro Carvalho Chehab
parent a3d71f256c
commit 9329e7b03c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/vivid/vivid-vid-common.c
View File

@ -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);