Commit b6bcdf76 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil
Browse files

media: v4l2-ctrls: Fix off-by-one error in integer menu control check 



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: d1e9b7c1 ("[media] V4L: Add support for integer menu controls with standard menu items")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 9047d90e

drivers/media/v4l2-core/v4l2-ctrls-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1827,7 +1827,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;

	}