From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans de Goede <hdegoede@redhat.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Ricardo Ribalda <ribalda@chromium.org>,
stable@vger.kernel.org
Subject: [PATCH v2 2/4] media: uvcvideo: Do not set an async control owned by other fh
Date: Wed, 27 Nov 2024 12:14:50 +0000 [thread overview]
Message-ID: <20241127-uvc-fix-async-v2-2-510aab9570dd@chromium.org> (raw)
In-Reply-To: <20241127-uvc-fix-async-v2-0-510aab9570dd@chromium.org>
If a file handle is waiting for a response from an async control, avoid
that other file handle operate with it.
Without this patch, the first file handle will never get the event
associated with that operation, which can lead to endless loops in
applications. Eg:
If an application A wants to change the zoom and to know when the
operation has completed:
it will open the video node, subscribe to the zoom event, change the
control and wait for zoom to finish.
If before the zoom operation finishes, another application B changes
the zoom, the first app A will loop forever.
Cc: stable@vger.kernel.org
Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_ctrl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index b6af4ff92cbd..3f8ae35cb3bc 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1955,6 +1955,10 @@ int uvc_ctrl_set(struct uvc_fh *handle,
if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR))
return -EACCES;
+ /* Other file handle is waiting a response from this async control. */
+ if (ctrl->handle && ctrl->handle != handle)
+ return -EBUSY;
+
/* Clamp out of range values. */
switch (mapping->v4l2_type) {
case V4L2_CTRL_TYPE_INTEGER:
--
2.47.0.338.g60cca15819-goog
next prev parent reply other threads:[~2024-11-27 12:14 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-27 12:14 [PATCH v2 0/4] media: uvcvideo: Two fixes for async controls Ricardo Ribalda
2024-11-27 12:14 ` [PATCH v2 1/4] media: uvcvideo: Remove dangling pointers Ricardo Ribalda
2024-11-28 22:16 ` Laurent Pinchart
2024-11-28 22:25 ` Ricardo Ribalda
2024-11-28 22:28 ` Laurent Pinchart
2024-11-29 0:21 ` Ricardo Ribalda
2024-11-29 21:22 ` Ricardo Ribalda
2024-11-27 12:14 ` Ricardo Ribalda [this message]
2024-11-28 22:22 ` [PATCH v2 2/4] media: uvcvideo: Do not set an async control owned by other fh Laurent Pinchart
2024-11-28 22:28 ` Ricardo Ribalda
2024-11-28 22:33 ` Laurent Pinchart
2024-11-29 10:36 ` Hans Verkuil
2024-11-29 10:59 ` Ricardo Ribalda
2024-11-29 11:06 ` Laurent Pinchart
2024-11-29 11:54 ` Ricardo Ribalda
2024-11-29 13:13 ` Hans Verkuil
2024-11-29 13:41 ` Ricardo Ribalda
2024-11-29 18:47 ` Ricardo Ribalda
2024-11-29 22:03 ` Laurent Pinchart
2024-11-29 22:18 ` Ricardo Ribalda
2024-12-02 0:18 ` Laurent Pinchart
2024-12-02 7:28 ` Ricardo Ribalda
2024-12-02 8:38 ` Laurent Pinchart
2024-12-02 10:11 ` Ricardo Ribalda
2024-12-02 8:05 ` Hans Verkuil
2024-12-02 8:11 ` Laurent Pinchart
2024-12-02 8:44 ` Hans Verkuil
2024-12-02 10:26 ` Hans de Goede
2024-12-02 10:50 ` Ricardo Ribalda
2024-12-02 12:19 ` Hans de Goede
2024-12-02 13:29 ` Ricardo Ribalda
2024-12-03 19:32 ` Laurent Pinchart
2024-12-04 13:46 ` Hans de Goede
2024-12-02 10:55 ` Hans Verkuil
2024-12-03 17:18 ` Laurent Pinchart
2024-12-04 7:59 ` Hans Verkuil
2024-12-04 8:04 ` Hans Verkuil
2024-12-04 9:13 ` Laurent Pinchart
2024-12-04 9:02 ` Laurent Pinchart
2024-11-29 13:10 ` Hans Verkuil
2024-11-29 13:32 ` Hans Verkuil
2024-11-29 13:37 ` Ricardo Ribalda
2024-11-29 21:47 ` Laurent Pinchart
2024-11-29 11:01 ` Laurent Pinchart
2024-11-27 12:14 ` [PATCH v2 3/4] media: uvcvideo: Annotate lock requirements for uvc_ctrl_set Ricardo Ribalda
2024-11-28 21:51 ` Laurent Pinchart
2024-11-27 12:14 ` [PATCH v2 4/4] media: uvcvideo: Remove redundant NULL assignment Ricardo Ribalda
2024-11-28 21:26 ` Laurent Pinchart
2024-11-28 21:34 ` Ricardo Ribalda
2024-11-28 21:47 ` Laurent Pinchart
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=20241127-uvc-fix-async-v2-2-510aab9570dd@chromium.org \
--to=ribalda@chromium.org \
--cc=guennadi.liakhovetski@intel.com \
--cc=hdegoede@redhat.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=mchehab@kernel.org \
--cc=stable@vger.kernel.org \
/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®