media: v4l2-ctrl: potential shift wrapping bugs
Subsystems (2)
PATCH 1/1 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 Dan Carpenter <[email protected]>
--- drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-ctrls.c +2 -2
@@ -1599,7 +1599,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,case V4L2_CTRL_TYPE_INTEGER_MENU :if (ptr.p_s32[idx] < ctrl->minimum || ptr.p_s32[idx] > ctrl->maximum)return -ERANGE ; -if (ctrl->menu_skip_mask & (1 << ptr.p_s32[idx])) +if (ctrl->menu_skip_mask & (1ULL << ptr.p_s32[idx]))return -EINVAL ;if (ctrl->type =V4L2_CTRL_TYPE_MENU && ctrl->qmenu[ptr.p_s32[idx]][0 ] ='\0' )
@@ -2918,7 +2918,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm)return -EINVAL ;/* 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 ;/* Empty menu items should also be skipped */ if (ctrl->type =V4L2_CTRL_TYPE_MENU ) {
Signature · 1 line
2.17.1
Hi Dan,
Thanks for the patch.
Quoted 7 lines · Dan Carpenter
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.
This seems to be caused by patch 0ba2aeb6dab8 ("[media] v4l2-ctrls:
increase internal min/max/step/def to 64 bit"). Backporting the fix isn't likely really important --- the reason being no-one has figured this out previously, very probably so because there are no menus that long.
Reviewed-by Sakari Ailus <[email protected]>
Quoted 28 lines
Signed-off-by Dan Carpenter <[email protected]>--- drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/v4l2-core/v4l2-ctrls.c +2
-2@@ -1599,7 +1599,7 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,case V4L2_CTRL_TYPE_INTEGER_MENU :if (ptr.p_s32[idx] < ctrl->minimum || ptr.p_s32[idx] > ctrl->maximum)return -ERANGE ; -if (ctrl->menu_skip_mask & (1 << ptr.p_s32[idx])) +if (ctrl->menu_skip_mask & (1ULL << ptr.p_s32[idx]))return -EINVAL ;if (ctrl->type =V4L2_CTRL_TYPE_MENU && ctrl->qmenu[ptr.p_s32[idx]][0 ] ='\0' )@@ -2918,7 +2918,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm)return -EINVAL ;/* 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 ;/* Empty menu items should also be skipped */ if (ctrl->type =V4L2_CTRL_TYPE_MENU ) {
Signature · 4 lines
Kind regards, Sakari Ailus [email protected]