| From 1e2569a1885a3f14526e5021707be292ccc92f0b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 26 Sep 2022 19:31:51 +0300 |
| Subject: media: v4l2-ctrls: Fix off-by-one error in integer menu control check |
| |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| |
| [ Upstream commit b6bcdf763db1f5ea602bf876cfe91debfb3c7773 ] |
| |
| 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@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> |
| --- |
| 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 45a76f40deeb..3798a57bbbd4 100644 |
| --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c |
| +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c |
| @@ -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; |
| } |
| -- |
| 2.35.1 |
| |
