| From 048c96e28674f15c0403deba2104ffba64544a06 Mon Sep 17 00:00:00 2001 |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Date: Wed, 20 Jan 2021 09:28:02 +0100 |
| Subject: media: v4l2-ctrls.c: fix shift-out-of-bounds in std_validate |
| |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| |
| commit 048c96e28674f15c0403deba2104ffba64544a06 upstream. |
| |
| If a menu has more than 64 items, then don't check menu_skip_mask |
| for items 65 and up. |
| |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Reported-by: syzbot+42d8c7c3d3e594b34346@syzkaller.appspotmail.com |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/media/v4l2-core/v4l2-ctrls.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/media/v4l2-core/v4l2-ctrls.c |
| +++ b/drivers/media/v4l2-core/v4l2-ctrls.c |
| @@ -2165,7 +2165,8 @@ static int std_validate(const struct v4l |
| 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 & (1ULL << ptr.p_s32[idx])) |
| + if (ptr.p_s32[idx] < BITS_PER_LONG_LONG && |
| + (ctrl->menu_skip_mask & BIT_ULL(ptr.p_s32[idx]))) |
| return -EINVAL; |
| if (ctrl->type == V4L2_CTRL_TYPE_MENU && |
| ctrl->qmenu[ptr.p_s32[idx]][0] == '\0') |
