From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lr2-f35.google.com (mail-lr2-f35.google.com [74.125.230.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65A3148D89C for ; Fri, 2 Oct 2026 11:21:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.230.99 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790940082; cv=none; b=E8NTatvEepJSqaz0v5y+7XL87ZDCvrH8v5r0iDFd/IiLPysxn0Q8jpmnsZEU4JHMzNrMLHyfJQwO2CgaqDIV3jlgt2dznrYzg9RgT9jYYpco41DUMpk3oAtuDJVxAQU0Xaa0KoLYg9VYtFxSG7PPQyxwicQ0EwvT4L/bJCdtEkY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790940082; c=relaxed/simple; bh=XcOKDhLPhYTwOzM/5M4/TmrnH66IhZP+myCUuGdY/04=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XfFRGJhahSzj+5N/DrElxtee1ZGAlSwYVtgO+DgFezaw3A0bIGL3hox8QZcA0J7dd+5T6BYhHn1k/0ynMzUUtLL4xCBNy8WDMebxvqslX73hIOgpJMpaMH6aQ4TSzLNyuY9xPsOmNDIg8XEeTVkhgBXhn195R1bcF9Wd1RmP6cw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=HvY1gSit; arc=none smtp.client-ip=74.125.230.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="HvY1gSit" Received: by mail-lr2-f35.google.com with SMTP id 38308e7fff4ca-3a612404718so72007861fa.2 for ; Fri, 02 Oct 2026 04:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1790940078; x=1791544878; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=w3svkKcm9Hs8mBBSgiJOeXpCrb7Wu+8PwEu9DhSKxdk=; b=HvY1gSit73LX8YVLUuj7MYTSIvCk5cNTAiJUSXpZZiooFUQMf198nNTlbUxtG2KuzI xIxkgfojKcQkmMjD+5Xi2VS4jhfYA4dFRbLzja8e34YbsjnGlxQVNkuwTvIfznrN6rwQ h6cerYYULzdVovvEYzYoGs7qbrnI1hfcKTQU0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790940078; x=1791544878; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=w3svkKcm9Hs8mBBSgiJOeXpCrb7Wu+8PwEu9DhSKxdk=; b=PulpnXIrc6maooalck7tDzAhdL4KbMakQOvqpxHAi0MTLr8gaSYXOLVlVHe5PpLJBr 2mLLrK2XSAg0COTASc1qgTHn9kcJHngKOEQLSD0+T29706h85MKIIgs6x4Co4yIRmmkX e2B5Xg8VuXGVtPhSTd+YdzwvJEWIaATn4cPtS98vw0tTof47HoJXcE5nAasJV116JIuz jJ30fHmrZ5q9Qrof9YZDJq54UAvrGuJ0l5boT2Nao03etibkaHS4N0514pyEACBKmU1d xYL8CMmFXIXrGCBmYGR6pQJ7kgdsuSpY+0rY2fHQXYYg6Joa8CwNwN9vRrzZ2HzQ9/jG LX/w== X-Forwarded-Encrypted: i=1; AKwUvBxMqeysjnYc4ktpj0Cyyxs18ZPy90mX23k/gGTXhnALyWykYWHmjmXyJ2VWsECC2E4CZvjnpEAg1sr8lU0=@vger.kernel.org X-Gm-Message-State: AFq9FYJzXNxXaauybrBUaf9qLCTuurli6rljUqBFdg5vriWxtcRWmHpM 4qql9Y/bM4r5OTbFkM0hlKUpc0tWazLtHIU7GkO2POYCYQvcQJer0YPhtgflkW1rwg== X-Gm-Gg: AYBFou0ymQfvp+Q2q5V0KUO/i6kkODoOY4dcM+m+dgJuSygFKsxdOWd8WDZU/Oea2J7 whTPLeoIb3iDQ4+Nv2m4NHdcZfIVEAPq5s+eeqwvnpS9J9UMPE2Y4LEF5v5ztnULRHQqzm4KeA6 0K84Comtj2hk5Vx4pWoVdcXlglpRFFT7x7jwACVZqn2c14MNZw5OrNl+HqLizu6xmnqFO1+9MuG YXPqvXmznEJl91B0uz0dO9tvaEgfwnXqeQnaqo13I7XzNweMsaZIRlcBDIOF/uD9FOe8WbnXln/ 9pU2JDCQrhKHn0DZx0bIyMzHxxJu9xB8N8L3rETLFuyYs4l03zs+rX3X8zxx70B+TdmbYI1eo6m z0Vk5DJlXgTGuX5hYd4iu9ffEm8Ku1ThgLetdag2ZGGQS0pr4c2h+aBtJgJ++JBJcnLHrIkM5jd m6qWRcMmInc7ZvTLr7JDXBtYGKAah2sZWATHw7xRBwH9D4Vo68hkS9tdLcRy6eX8GmRMsn3RR9V mgj72EbeWIpG2aoLfbQy9KtaeYvmNRn88WYyowKfUBGC+H1EhHAjrE= X-Received: by 2002:a05:651c:43c2:20b0:39f:1b37:82bd with SMTP id 38308e7fff4ca-3a88777f837mr4192461fa.11.1790940078458; Fri, 02 Oct 2026 04:21:18 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a87e324350sm8562931fa.36.2026.10.02.04.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2026 04:21:18 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 02 Oct 2026 11:21:11 +0000 Subject: [PATCH v2 2/2] media: uvcvideo: Do not read beyond the uvc_status_control memory Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261002-uvc-status-11-v2-2-a98a135df0eb@chromium.org> References: <20261002-uvc-status-11-v2-0-a98a135df0eb@chromium.org> In-Reply-To: <20261002-uvc-status-11-v2-0-a98a135df0eb@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.14.3 When we receive an event from the camera we only receive up to wMaxPacketSize bytes. If a v4l2 control is mapped into a UVC control beyond those bytes, right now the code is blindly reading them. Add a check in the event handler to ignore controls that are outside the data provided by the camera. Note that this patch now dynamically allocates the size for the status based on wMaxPacketSize instead of blindly use 16 bytes. Cc: stable@vger.kernel.org Closes: https://sashiko.dev/#/patchset/F0F008459FFA835D%2B20260813074632.2021311-1-raoxu%40uniontech.com Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++--- drivers/media/usb/uvc/uvc_driver.c | 2 +- drivers/media/usb/uvc/uvc_status.c | 18 +++++++++++++----- drivers/media/usb/uvc/uvcvideo.h | 9 ++++++--- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 6224ecf28ec6..e61235e83e80 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2142,7 +2142,8 @@ static int uvc_ctrl_clear_handle(struct uvc_control *ctrl) } void uvc_ctrl_status_event(struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data) + struct uvc_control *ctrl, const u8 *data, + size_t size) { struct uvc_control_mapping *mapping; struct uvc_fh *handle; @@ -2162,6 +2163,9 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, if (uvc_ctrl_mapping_is_compound(mapping)) value = 0; + else if (DIV_ROUND_UP(mapping->offset + mapping->size, 8) > + size) + continue; else value = uvc_mapping_get_s32(mapping, UVC_GET_CUR, data); @@ -2191,7 +2195,7 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) struct uvc_ctrl_work *w = &dev->async_ctrl; int ret; - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); + uvc_ctrl_status_event(w->chain, w->ctrl, w->data, w->size); /* The barrier is needed to synchronize with uvc_status_stop(). */ if (smp_load_acquire(&dev->flush_status)) @@ -2206,7 +2210,8 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) } bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data) + struct uvc_control *ctrl, const u8 *data, + size_t size) { struct uvc_device *dev = chain->dev; struct uvc_ctrl_work *w = &dev->async_ctrl; @@ -2218,6 +2223,7 @@ bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, w->urb = urb; w->chain = chain; w->ctrl = ctrl; + w->size = size; schedule_work(&w->work); diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 468d46dfb9e7..b57825fadea1 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1305,7 +1305,7 @@ static void uvc_gpio_event(struct uvc_device *dev) /* GPIO entities are always on the first chain. */ chain = list_first_entry(&dev->chains, struct uvc_video_chain, list); - uvc_ctrl_status_event(chain, unit->controls, &new_val); + uvc_ctrl_status_event(chain, unit->controls, &new_val, sizeof(new_val)); } static int uvc_gpio_get_cur(struct uvc_device *dev, struct uvc_entity *entity, diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index 97c939206302..a88fa57513fb 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -169,6 +169,7 @@ static bool uvc_event_control(struct urb *urb, struct uvc_device *dev = urb->context; struct uvc_video_chain *chain; struct uvc_control *ctrl; + size_t ctrl_len; if (len < 6 || status->bEvent != 0 || status->control.bAttribute >= ARRAY_SIZE(attrs)) { @@ -187,8 +188,10 @@ static bool uvc_event_control(struct urb *urb, switch (status->control.bAttribute) { case UVC_CTRL_VALUE_CHANGE: + ctrl_len = len - offsetof(struct uvc_status, control.bValue); return uvc_ctrl_status_event_async(urb, chain, ctrl, - status->control.bValue); + status->control.bValue, + ctrl_len); case UVC_CTRL_INFO_CHANGE: case UVC_CTRL_FAILURE_CHANGE: @@ -257,13 +260,18 @@ int uvc_status_init(struct uvc_device *dev) struct usb_host_endpoint *ep = dev->int_ep; unsigned int pipe; int interval; + size_t size; mutex_init(&dev->status_lock); if (ep == NULL) return 0; - dev->status = kzalloc_obj(*dev->status); + size = usb_endpoint_maxp(&ep->desc); + if (!size) + return -EINVAL; + + dev->status = kzalloc(size, GFP_KERNEL); if (!dev->status) return -ENOMEM; @@ -286,7 +294,7 @@ int uvc_status_init(struct uvc_device *dev) interval = fls(interval) - 1; usb_fill_int_urb(dev->int_urb, dev->udev, pipe, - dev->status, sizeof(*dev->status), uvc_status_complete, + dev->status, size, uvc_status_complete, dev, interval); uvc_input_init(dev); @@ -360,7 +368,7 @@ static void uvc_status_stop(struct uvc_device *dev) * process it synchronously. */ if (cancel_work_sync(&w->work)) - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); + uvc_ctrl_status_event(w->chain, w->ctrl, w->data, w->size); /* Kill the urb. */ usb_kill_urb(dev->int_urb); @@ -372,7 +380,7 @@ static void uvc_status_stop(struct uvc_device *dev) * uvc_status_start() call. */ if (cancel_work_sync(&w->work)) - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); + uvc_ctrl_status_event(w->chain, w->ctrl, w->data, w->size); } int uvc_status_resume(struct uvc_device *dev) diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 69ee3d0c971d..788cee0c409d 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -567,7 +567,7 @@ struct uvc_status_streaming { struct uvc_status_control { u8 bSelector; u8 bAttribute; - u8 bValue[11]; + u8 bValue[]; } __packed; struct uvc_status { @@ -629,6 +629,7 @@ struct uvc_device { struct uvc_video_chain *chain; struct uvc_control *ctrl; const void *data; + size_t size; } async_ctrl; struct uvc_entity *gpio_unit; @@ -771,9 +772,11 @@ int uvc_ctrl_init_device(struct uvc_device *dev); void uvc_ctrl_cleanup_device(struct uvc_device *dev); int uvc_ctrl_restore_values(struct uvc_device *dev); bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data); + struct uvc_control *ctrl, const u8 *data, + size_t size); void uvc_ctrl_status_event(struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data); + struct uvc_control *ctrl, const u8 *data, + size_t size); int uvc_ctrl_begin(struct uvc_video_chain *chain); int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, -- 2.56.0.rc1.315.gc6ed9934b7-goog