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

media: v4l2-ctrl: potential shift wrapping bugs

This code generates a static checker warning:

    drivers/media/v4l2-core/v4l2-ctrls.c:2921 v4l2_querymenu()
    warn: should '(1 << i)' be a 64 bit type?

The problem is that "ctrl->menu_skip_mask" is a u64 and we're only
testing the lower 32 bits.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 0e633f97
...@@ -1605,7 +1605,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx, ...@@ -1605,7 +1605,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,
case V4L2_CTRL_TYPE_INTEGER_MENU: case V4L2_CTRL_TYPE_INTEGER_MENU:
if (ptr.p_s32[idx] < ctrl->minimum || ptr.p_s32[idx] > ctrl->maximum) if (ptr.p_s32[idx] < ctrl->minimum || ptr.p_s32[idx] > ctrl->maximum)
return -ERANGE; return -ERANGE;
if (ctrl->menu_skip_mask & (1 << ptr.p_s32[idx])) if (ctrl->menu_skip_mask & (1ULL << ptr.p_s32[idx]))
return -EINVAL; return -EINVAL;
if (ctrl->type == V4L2_CTRL_TYPE_MENU && if (ctrl->type == V4L2_CTRL_TYPE_MENU &&
ctrl->qmenu[ptr.p_s32[idx]][0] == '\0') ctrl->qmenu[ptr.p_s32[idx]][0] == '\0')
...@@ -2930,7 +2930,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm) ...@@ -2930,7 +2930,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm)
return -EINVAL; return -EINVAL;
/* Use mask to see if this menu item should be skipped */ /* Use mask to see if this menu item should be skipped */
if (ctrl->menu_skip_mask & (1 << i)) if (ctrl->menu_skip_mask & (1ULL << i))
return -EINVAL; return -EINVAL;
/* Empty menu items should also be skipped */ /* Empty menu items should also be skipped */
if (ctrl->type == V4L2_CTRL_TYPE_MENU) { if (ctrl->type == V4L2_CTRL_TYPE_MENU) {
......
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