From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: Yunke Cao <yunkec@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Ricardo Ribalda <ribalda@chromium.org>,
Yunke Cao <yunkec@google.com>
Subject: [PATCH v17 15/17] media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map
Date: Mon, 03 Feb 2025 11:55:51 +0000 [thread overview]
Message-ID: <20250203-uvc-roi-v17-15-5900a9fed613@chromium.org> (raw)
In-Reply-To: <20250203-uvc-roi-v17-0-5900a9fed613@chromium.org>
Do not process unknown data types.
Tested-by: Yunke Cao <yunkec@google.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_v4l2.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 41430720ed47..d56f482723d3 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -108,6 +108,12 @@ static int uvc_ioctl_xu_ctrl_map(struct uvc_video_chain *chain,
struct uvc_control_mapping *map;
int ret;
+ if (xmap->data_type > UVC_CTRL_DATA_TYPE_BITMASK) {
+ uvc_dbg(chain->dev, CONTROL,
+ "Unsupported UVC data type %u\n", xmap->data_type);
+ return -EINVAL;
+ }
+
map = kzalloc(sizeof(*map), GFP_KERNEL);
if (map == NULL)
return -ENOMEM;
--
2.48.1.362.g079036d154-goog
next prev parent reply other threads:[~2025-02-03 11:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 11:55 [PATCH v17 00/17] media: uvcvideo: Implement UVC v1.5 ROI Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 01/17] media: v4l2_ctrl: Add V4L2_CTRL_TYPE_RECT Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 02/17] media: v4l2-ctrls: add support for V4L2_CTRL_WHICH_MIN/MAX_VAL Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 03/17] media: vivid: Add a rectangle control Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 04/17] media: uvcvideo: Handle uvc menu translation inside uvc_get_le_value Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 05/17] media: uvcvideo: Handle uvc menu translation inside uvc_set_le_value Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 06/17] media: uvcvideo: refactor uvc_ioctl_g_ext_ctrls Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 07/17] media: uvcvideo: uvc_ioctl_(g|s)_ext_ctrls: handle NoP case Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 08/17] media: uvcvideo: Support any size for mapping get/set Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 09/17] media: uvcvideo: Factor out clamping from uvc_ctrl_set Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 10/17] media: uvcvideo: add support for compound controls Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 11/17] media: uvcvideo: Factor out query_boundaries from query_ctrl Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 12/17] media: uvcvideo: support V4L2_CTRL_WHICH_MIN/MAX_VAL Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 13/17] media: uvcvideo: let v4l2_query_v4l2_ctrl() work with v4l2_query_ext_ctrl Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 14/17] media: uvcvideo: Introduce uvc_mapping_v4l2_size Ricardo Ribalda
2025-02-03 11:55 ` Ricardo Ribalda [this message]
2025-02-03 11:55 ` [PATCH v17 16/17] media: uvcvideo: implement UVC v1.5 ROI Ricardo Ribalda
2025-03-03 13:32 ` Hans Verkuil
2025-03-03 14:02 ` Hans de Goede
2025-03-03 14:58 ` Hans Verkuil
2025-03-03 16:06 ` Ricardo Ribalda
2025-02-03 11:55 ` [PATCH v17 17/17] media: uvcvideo: document " Ricardo Ribalda
2025-02-10 16:07 ` [PATCH v17 00/17] media: uvcvideo: Implement " Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250203-uvc-roi-v17-15-5900a9fed613@chromium.org \
--to=ribalda@chromium.org \
--cc=hdegoede@redhat.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=yunkec@chromium.org \
--cc=yunkec@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®