diff options
| author | fire855 <thefire855@gmail.com> | 2017-08-19 20:57:37 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-08-20 14:45:21 +0200 |
| commit | 436d8fbbd678c1cb755c744e7176e83786fac28c (patch) | |
| tree | e05413293ffb8aa3a76c7cd188d74445dc073114 /drivers/media | |
| parent | c112fe63f337712984a4525f43b43081d3138ff3 (diff) | |
Merge mediatek security patches
* Revert : Merge mediatek security patches (14326e25d3fc3b4d780c2d9d2eebbe3231ad5376)
* Reapply : 14326e25d3fc3b4d780c2d9d2eebbe3231ad5376
Signed-off-by: Mister Oyster <oysterized@gmail.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_ctrl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index a2f4501c2..f61d1d7ba 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1939,6 +1939,9 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, if (!found) return -ENOENT; + if (ctrl->info.size < mapping->size) + return -EINVAL; + if (mutex_lock_interruptible(&chain->ctrl_mutex)) return -ERESTARTSYS; |