Commit 6c06108b authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

[media] V4L/DVB: v4l2-ioctl: integer overflow in video_usercopy()

If ctrls->count is too high the multiplication could overflow and
array_size would be lower than expected.  Mauro and Hans Verkuil
suggested that we cap it at 1024.  That comes from the maximum
number of controls with lots of room for expantion.

$ grep V4L2_CID include/linux/videodev2.h | wc -l
211

Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e82db75d
...@@ -2226,6 +2226,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, ...@@ -2226,6 +2226,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
struct v4l2_ext_controls *ctrls = parg; struct v4l2_ext_controls *ctrls = parg;
if (ctrls->count != 0) { if (ctrls->count != 0) {
if (ctrls->count > V4L2_CID_MAX_CTRLS) {
ret = -EINVAL;
break;
}
*user_ptr = (void __user *)ctrls->controls; *user_ptr = (void __user *)ctrls->controls;
*kernel_ptr = (void *)&ctrls->controls; *kernel_ptr = (void *)&ctrls->controls;
*array_size = sizeof(struct v4l2_ext_control) *array_size = sizeof(struct v4l2_ext_control)
......
...@@ -1132,6 +1132,7 @@ struct v4l2_querymenu { ...@@ -1132,6 +1132,7 @@ struct v4l2_querymenu {
#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 #define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000
/* User-class control IDs defined by V4L2 */ /* User-class control IDs defined by V4L2 */
#define V4L2_CID_MAX_CTRLS 1024
#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) #define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900)
#define V4L2_CID_USER_BASE V4L2_CID_BASE #define V4L2_CID_USER_BASE V4L2_CID_BASE
/* IDs reserved for driver specific controls */ /* IDs reserved for driver specific controls */
......
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