mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
media: v4l2-ctrls: Fix off-by-one error in integer menu control check
[ Upstream commitb6bcdf763d
] The V4L2 API defines the maximum value for an integer menu control as the number of elements minus one. The v4l2_ctrl_new_std_menu() validates this constraint with an off-by-one error. Fix it. Fixes:d1e9b7c12b
("[media] V4L: Add support for integer menu controls with standard menu items") Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1caed03305
commit
9a402adc9f
1 changed files with 1 additions and 1 deletions
|
@ -1456,7 +1456,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
|
|||
else if (type == V4L2_CTRL_TYPE_INTEGER_MENU)
|
||||
qmenu_int = v4l2_ctrl_get_int_menu(id, &qmenu_int_len);
|
||||
|
||||
if ((!qmenu && !qmenu_int) || (qmenu_int && max > qmenu_int_len)) {
|
||||
if ((!qmenu && !qmenu_int) || (qmenu_int && max >= qmenu_int_len)) {
|
||||
handler_set_err(hdl, -EINVAL);
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue