Hi Laurent,
On Mon, Sep 26, 2022 at 07:31:51PM +0300, Laurent Pinchart wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
>
> 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: d1e9b7c12b74 ("[media] V4L: Add support for integer menu controls with standard menu items")
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-ctrls-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
> index 1f85828d6694..322f9f715b65 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
> @@ -1762,7 +1762,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;
> }
Reviewed-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
--
Kind regards,
Sakari Ailus
