From patchwork Mon Dec 2 14:24:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 846822 Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) (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 C5EDC203711 for ; Mon, 2 Dec 2024 14:24:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149483; cv=none; b=HmphMU93EQn+AVJaXcGXg2hp9/jPeawHLVi1f0+1pXU5p9VsWwJyUxfBokZtrSCfimluW0H4flHTy17uACALnmuGLSwbvOEoHV6xnmsXFEbbcKY1irmwpcKxImx7GgRz2+Ysh0Hiz/G98taXXowZtDTegJqJe0DFLct3qL6Y0zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149483; c=relaxed/simple; bh=JIoL17arYYY+WJ1P2Tyw3eLMLkgho4uZtx1nVbBKRgo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DBWX4wGovzzwD8sTB/ReuOG6YAZ6BxvbN3lkP0X78TeZsMaKJqI9sAtDxesrZxXKvTF93q8d6z19BNoMhPGlKSE4mOn3yT0wUd4EW/xRTc3vnxxb036oo7Hjg5LaieYOPPxMiNwuKr22ooFgdd6H4XrGICkDgz/n/KvKNEeuiPs= 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=jl1mVenA; arc=none smtp.client-ip=209.85.161.41 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="jl1mVenA" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5f1e7639391so1342480eaf.0 for ; Mon, 02 Dec 2024 06:24:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733149481; x=1733754281; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZlS6BJbN8gylinhy8s0wE1xSPoRGB+PwrEezFLyVemI=; b=jl1mVenAXrfFRzW+U6Kt/gnG11Cn00pN+LhtZ9qNyrBErmT6NwlAPz7lEhwrpvdbT3 AbrW0A/RR9TE73Tu1Oo4tqO8ta7WGOVDw29s7AlCJ99IgIduX35Z0mameiVcwHuoXSTs cf/n75bV8rSubbU0zz5+60r1tiery5qoSo9ss= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733149481; x=1733754281; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZlS6BJbN8gylinhy8s0wE1xSPoRGB+PwrEezFLyVemI=; b=ZXJGC9w5YzVcbx2IeYdw5fK9rSOJ1WsbvzPpNBYnt0vq7l9g5nTDUpjdjiwJHlR8Yj P4+PGzPmE2fWWI0Ia71EloW/Iml0VoYSFu6tw6zFhVmSqfL93efxlfjxH1ih6DRgilJk CQ0xq23DxdVGtBrtg9PvgXhVxoa2e9qe5su3KMItfoFlNLTKC3AI9XSZ09m2R4KHTRNE mAl7VdJhOIv+DnPipQRpbN/k3s1Kp5ZE4scOKQ8E4W2mjjulbEHUEhK5J/QB96xDAS7t v/fmvaexW6Ck9iOn2XdJhKSQsempDmBvxZsyZRp24iHba0F63gfy/KLyH0nWzUB0G/Hf zWQg== X-Forwarded-Encrypted: i=1; AJvYcCU98HjQyCSV3ufhwRQn7WlPJ2W9S7Ldm7We+Rqv6t+OTwM7gxRem4y8lhT/k7wjC4PzJKYZAzioVI/O1w==@vger.kernel.org X-Gm-Message-State: AOJu0YwIGmMgcAo5qINgg22RanKj81tNSb8FZBScumA9BVq0CiAXyRQY Qt4rTJuegEgwGDPWgqzxtq3lXOFTgY3jhzQ4U+GP2j9AMSWwB16GgjdLCV5XVQ== X-Gm-Gg: ASbGnctcMCJ5/SGYOQQgkUo79qJPKgCw0/bkyPFiHarVwesl6hIDQfgfF6NkzvEWAzj LH46gMywcec+rQY0P0KYb6cU9/UNmhBPJeqhificbqoNIRk06PjmQDV98C3Z8JNiEOV+exet1r0 oUXgLBk3GuyZwK6F3pE/ojplAUHv0w6pJCTDA7M2hTdrWTqNrWTHzm6vy4DRfEmnbQems/XzIBe O2fvwg6aawupKUjfnJSe9J7s7q+sEVMTapG5kVfKPkQt4wHU1JBe1Itg0YoMhJhfLXQ44+3DfbN 6G+N+6dEM3EWVf42nzsLZsIC X-Google-Smtp-Source: AGHT+IHf7xfPeTnIxhLY6p/5p9023eGvkBrVh98IJJaw48pna5VKZ8hh5eZx/e2fyBNDJsz/FgZFPg== X-Received: by 2002:a05:6359:7609:b0:1c6:1d01:9ffe with SMTP id e5c5f4694b2df-1cab15b6233mr839794555d.10.1733149480869; Mon, 02 Dec 2024 06:24:40 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-85be9087890sm179710241.25.2024.12.02.06.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 06:24:39 -0800 (PST) From: Ricardo Ribalda Date: Mon, 02 Dec 2024 14:24:35 +0000 Subject: [PATCH v5 1/5] media: uvcvideo: Only save async fh if success Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241202-uvc-fix-async-v5-1-6658c1fe312b@chromium.org> References: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> In-Reply-To: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.13.0 Now we keep a reference to the active fh for any call to uvc_ctrl_set, regardless if it is an actual set or if it is a just a try or if the device refused the operation. We should only keep the file handle if the device actually accepted applying the operation. Cc: stable@vger.kernel.org Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives") Suggested-by: Hans de Goede Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 4fe26e82e3d1..9a80a7d8e73a 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1811,7 +1811,10 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain) } static int uvc_ctrl_commit_entity(struct uvc_device *dev, - struct uvc_entity *entity, int rollback, struct uvc_control **err_ctrl) + struct uvc_fh *handle, + struct uvc_entity *entity, + int rollback, + struct uvc_control **err_ctrl) { struct uvc_control *ctrl; unsigned int i; @@ -1859,6 +1862,10 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, *err_ctrl = ctrl; return ret; } + + if (!rollback && handle && + ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) + ctrl->handle = handle; } return 0; @@ -1895,8 +1902,8 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, /* Find the control. */ list_for_each_entry(entity, &chain->entities, chain) { - ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback, - &err_ctrl); + ret = uvc_ctrl_commit_entity(chain->dev, handle, entity, + rollback, &err_ctrl); if (ret < 0) { if (ctrls) ctrls->error_idx = @@ -2046,9 +2053,6 @@ int uvc_ctrl_set(struct uvc_fh *handle, mapping->set(mapping, value, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); - if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) - ctrl->handle = handle; - ctrl->dirty = 1; ctrl->modified = 1; return 0; @@ -2377,7 +2381,7 @@ int uvc_ctrl_restore_values(struct uvc_device *dev) ctrl->dirty = 1; } - ret = uvc_ctrl_commit_entity(dev, entity, 0, NULL); + ret = uvc_ctrl_commit_entity(dev, NULL, entity, 0, NULL); if (ret < 0) return ret; } From patchwork Mon Dec 2 14:24:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 846821 Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (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 04AE7204F8A for ; Mon, 2 Dec 2024 14:24:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149488; cv=none; b=jdRNg6D5uCyV8viZPElhdeuPiX4xuBClf2UCw5BL4CRqUCVahGy7hOM3DkTwq7BR1bITpcY3higHlGO6Kbyo5dXXwJm4rup4Vo1sVGAcd1+X0qGM6DIErwJGl+HgRTse4DRK5CSWGBAIsbaDdu1YDQd7h/pmIw1R+ZznbiLU+Ko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149488; c=relaxed/simple; bh=2CouL6TauW+OfYTjBFsOKvayyxDlTHWIFYpffgKYGh4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LabEaHYp11mjkGu2VNBaNVowk9uZqmUeT3BGMVcNAWge9Qpm4QL48rbVQb5f/HKkoieGSsRGkUG6dO5IF6RxvZzszuRkDuL7XiBT+AArPi2GxPE+4MEjitib8L3fTSxAoHwCelkpjo3b8RoO0nVcqsq5ZRew+hnDmB2mKd9uLl0= 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=QQt+Cel/; arc=none smtp.client-ip=209.85.160.51 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="QQt+Cel/" Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-29e2a50586dso1540247fac.0 for ; Mon, 02 Dec 2024 06:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733149483; x=1733754283; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qLNHXjJlr/6qPBJLlmj7xWzEmuF7V3Sn4z0szK5h1CI=; b=QQt+Cel/9pcHXIo351Fm6cSzKXJJH94/WB2pyW+SWXCWffVvlENBc0OnhJU1p7dje8 4xfu8pOaZKteALYVyIaBWsg9a4/DzzLrcf7sUI8p+cpjOuo/WLgurrnTWtb4yIdZ0V31 2ok4xPPtxO9w/VfDXN0WFKwNyd0XL12YBtJjw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733149483; x=1733754283; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qLNHXjJlr/6qPBJLlmj7xWzEmuF7V3Sn4z0szK5h1CI=; b=bPEM+lv1wKv+7HgjTnfvDJnBFlGDUZaIunCJH1NSDkY7V8yUuQ1QIsW96PzvAfM8IV uRTcMw6R6LucsQcB55qr1tz+FFCUKvi8X9rINuT0DEntceOCuD7BYCt/B0R9gmOLWHFQ wl6MMpUbd3q+my50QKM/SSTEzUv80yzMzZFDgpODWzRihlhA2ktzpQJfvXbn8jD8PfSq YGsR4p3BOswEbDck1SVvC3oTBqKq4NahCFX/1BianNW8xUYDlsYGcjmajQrcTAYN210C IzpiDDubonIFcIFD28cCMqtGK6cAzPy8DypkFboTGV7OscKSxZTaovV3HeKAad+cHI9l 5Kgw== X-Forwarded-Encrypted: i=1; AJvYcCUiE8vGeuyx/s60JHJuFXQcq7dEKFezwZoun8ijSN5FaVMOEa3AyKk+C5Zc048vaxuXU2g4LIHIT5KxPA==@vger.kernel.org X-Gm-Message-State: AOJu0YxLW/fDNnE6GCIcq6jPY3YOm2QetPgY3MySq291tfMyBguBIcCs 1h3g/5iYx8imaHGVFHLzpibet6rtajYWBRPo89co4AR5MSKC+ZlFcgr5Xb5RFg== X-Gm-Gg: ASbGncuiWCjx7DxqzI7CdAZNz2LjaGUsLF0B6Gpqve816Okuc8ZBAq0tgukbFri5smS vPpO1mq3wv70YYXXmyudwln/sqfuYcpiWiAOO0mDvKz/xGZiqGEeeehnikIvVIyZ2sj9/DRFSdf uKIZN5yuoEWPRI8KWmmGVqqLui+Ce0PvXEN1TXut+DSIVRjEebsSae25Xh7ZH7hZyKfSlxwwIsT 6pgxNsqsWN/X2pyYCMs+r3/Pm++VUUyAaXWUFoWoHLR1K81oXAmJsXfMxTEybdipb/e4LG8Gvn9 Lohf2l8XsBKvvnABfz4vDeGx X-Google-Smtp-Source: AGHT+IHOmHK950Sz16eLfZ56imS30OV+bUBssh4g96SgnL/6rRx0a78AipUgKMzMa352e4qpARm5UA== X-Received: by 2002:a05:6358:50ca:b0:1b8:3283:ec6e with SMTP id e5c5f4694b2df-1cab169cf8emr614679055d.24.1733149483059; Mon, 02 Dec 2024 06:24:43 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-85be9087890sm179710241.25.2024.12.02.06.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 06:24:41 -0800 (PST) From: Ricardo Ribalda Date: Mon, 02 Dec 2024 14:24:36 +0000 Subject: [PATCH v5 2/5] media: uvcvideo: Remove dangling pointers Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241202-uvc-fix-async-v5-2-6658c1fe312b@chromium.org> References: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> In-Reply-To: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.13.0 When an async control is written, we copy a pointer to the file handle that started the operation. That pointer will be used when the device is done. Which could be anytime in the future. If the user closes that file descriptor, its structure will be freed, and there will be one dangling pointer per pending async control, that the driver will try to use. Clean all the dangling pointers during release(). To avoid adding a performance penalty in the most common case (no async operation), a counter has been introduced with some logic to make sure that it is properly handled. Cc: stable@vger.kernel.org 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 | 52 ++++++++++++++++++++++++++++++++++++++-- drivers/media/usb/uvc/uvc_v4l2.c | 2 ++ drivers/media/usb/uvc/uvcvideo.h | 9 ++++++- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 9a80a7d8e73a..af1e38f5c6e9 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1579,6 +1579,37 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain, uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes); } +static void uvc_ctrl_get_handle(struct uvc_fh *handle, struct uvc_control *ctrl) +{ + lockdep_assert_held(&handle->chain->ctrl_mutex); + + if (ctrl->handle) + dev_warn_ratelimited(&handle->stream->dev->udev->dev, + "UVC non compliance: Setting an async control with a pending operation."); + + if (handle == ctrl->handle) + return; + + if (ctrl->handle) + ctrl->handle->pending_async_ctrls--; + + ctrl->handle = handle; + handle->pending_async_ctrls++; +} + +static void uvc_ctrl_put_handle(struct uvc_fh *handle, struct uvc_control *ctrl) +{ + lockdep_assert_held(&handle->chain->ctrl_mutex); + + if (ctrl->handle != handle) /* Nothing to do here.*/ + return; + + ctrl->handle = NULL; + if (WARN_ON(!handle->pending_async_ctrls)) + return; + handle->pending_async_ctrls--; +} + void uvc_ctrl_status_event(struct uvc_video_chain *chain, struct uvc_control *ctrl, const u8 *data) { @@ -1589,7 +1620,8 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, mutex_lock(&chain->ctrl_mutex); handle = ctrl->handle; - ctrl->handle = NULL; + if (handle) + uvc_ctrl_put_handle(handle, ctrl); list_for_each_entry(mapping, &ctrl->info.mappings, list) { s32 value = __uvc_ctrl_get_value(mapping, data); @@ -1865,7 +1897,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, if (!rollback && handle && ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) - ctrl->handle = handle; + uvc_ctrl_get_handle(handle, ctrl); } return 0; @@ -2774,6 +2806,22 @@ int uvc_ctrl_init_device(struct uvc_device *dev) return 0; } +void uvc_ctrl_cleanup_fh(struct uvc_fh *handle) +{ + struct uvc_entity *entity; + + guard(mutex)(&handle->chain->ctrl_mutex); + + if (!handle->pending_async_ctrls) + return; + + list_for_each_entry(entity, &handle->chain->dev->entities, list) + for (unsigned int i = 0; i < entity->ncontrols; ++i) + uvc_ctrl_put_handle(handle, &entity->controls[i]); + + WARN_ON(handle->pending_async_ctrls); +} + /* * Cleanup device controls. */ diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 97c5407f6603..b425306a3b8c 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -652,6 +652,8 @@ static int uvc_v4l2_release(struct file *file) uvc_dbg(stream->dev, CALLS, "%s\n", __func__); + uvc_ctrl_cleanup_fh(handle); + /* Only free resources if this is a privileged handle. */ if (uvc_has_privileges(handle)) uvc_queue_release(&stream->queue); diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 07f9921d83f2..92ecdd188587 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -337,7 +337,11 @@ struct uvc_video_chain { struct uvc_entity *processing; /* Processing unit */ struct uvc_entity *selector; /* Selector unit */ - struct mutex ctrl_mutex; /* Protects ctrl.info */ + struct mutex ctrl_mutex; /* + * Protects ctrl.info, + * ctrl.handle and + * uvc_fh.pending_async_ctrls + */ struct v4l2_prio_state prio; /* V4L2 priority state */ u32 caps; /* V4L2 chain-wide caps */ @@ -612,6 +616,7 @@ struct uvc_fh { struct uvc_video_chain *chain; struct uvc_streaming *stream; enum uvc_handle_state state; + unsigned int pending_async_ctrls; }; struct uvc_driver { @@ -797,6 +802,8 @@ int uvc_ctrl_is_accessible(struct uvc_video_chain *chain, u32 v4l2_id, int uvc_xu_ctrl_query(struct uvc_video_chain *chain, struct uvc_xu_control_query *xqry); +void uvc_ctrl_cleanup_fh(struct uvc_fh *handle); + /* Utility functions */ struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts, u8 epaddr); From patchwork Mon Dec 2 14:24:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 846820 Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (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 85CF7205E34 for ; Mon, 2 Dec 2024 14:24:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149490; cv=none; b=dVGKYSk7uCn3fvU9mnQ+wDVc+18U3bsvcWVS9f5xxnX+Jzr7venrj8ww8s1msNMVy1MrazOQoxdryra72u8FSPyzHbW4IMFDc3RaA6FTcxn1Q3k8khsse1VzEc4U89lZt8d0NI9B7VeVW3x9Uap9Ze8DUlXzShVJogXdbIrmMYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733149490; c=relaxed/simple; bh=AywEVRIa8VWMmuquTxALkCvhjnUbojSmLJ871LrwGJQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Aewj1xlHduHkrTPfRjPJiBufVntMavQF6++sSKb9V5s+guJd0cWIXFhnXtAKt0ADp55QzkNyrwvFG/ejMqECaxdhIlbTH7S1b5Vbjb2wHz6kG+3mYh0pEHSS2Dc//upXsOzjmJjdB1Qz5czYwV92Db4zB7YOl5+3G67Vn01NwVI= 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=fcXU1MHM; arc=none smtp.client-ip=209.85.161.53 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="fcXU1MHM" Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-5f1ff6a2128so1531764eaf.2 for ; Mon, 02 Dec 2024 06:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733149488; x=1733754288; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GovaJn86FmnHeAFnjgqTGOhPMZTKviIql5RFEvQWovM=; b=fcXU1MHMRPMn5LDryzdrt2KzjjCKKip1+g8PaY1mnx192vtCVb0kL0uZ7zYMtLlMND bZjfuS0O8aMVWPKUz403KxkpKi6n7upPmRr74QEX7susveFQpQttuDl1vzIeVOxoNqdI 2N2u0pF7iEF+paA8mSLgpF+SqlRGOELyZaDmc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733149488; x=1733754288; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GovaJn86FmnHeAFnjgqTGOhPMZTKviIql5RFEvQWovM=; b=pJ9G0fZvKBe9W7r96il9yHQOLZNYvQRcCms9cUEfm8rYNfQdohG1LG4j84MaMbSNvk CGTJJ5BopdJW8zX70+En7ElMwGdt6dtIlhoMgsgFXRFzb/hW7it2Y/xI2qaV8/Lb8mgD U1UhMBZclhAZ/zUK9h+dA/qC8nKg1NqmJ65oM17JuV7mG4T7Yd01X1KVPjgVB7QV1rSK yWql3fXMTrYGh/uHlqRDRYQLzNMYvC7dD9BQotsOLrwgw8q84dZuSpHRXm1DDv0Q7YTv E3YWLnSY283YF7id+0EIAz0RwG5fz1WCVD/AibrqjdRx2rr5SeO2RaNDQS+dc6qC6AbJ jYLg== X-Forwarded-Encrypted: i=1; AJvYcCXxQggH5fw8gePbgXSe2gCqRL83AoxPOXTEzVLP2p7GwMKrFMDG6WE1jP800DM9XwV2KnRqllSqedHObw==@vger.kernel.org X-Gm-Message-State: AOJu0Ywq+MsqZGPFJhSpiMXQLTy57pEkRnJoFvRS4ySValU7d1ZSe0rt dwXITkKySGlyG94q0Ccaf6Fi15hYVaGes5c0PLjPx7/MBXypb9oS3l8JykwJ6A== X-Gm-Gg: ASbGncu/0Qc2+uJtXMEjwWXRs7ZtM9mFnmbWX/OixNfMjNBrs8nFCuaM5tnAnrxfLKR 9d8VHj9fb0ZVZ66csdIatV1IPbuo8lIOiWxpND7DTiQZ/zZvNt0JxcAfC17PSiO8ANcc5MUdqXK mB9h7UtS7xZlMWT9Bt02bMfXiWh+D0UvoroLSLvoQWNPlKsVYSWPpVjmTJbzKcBvsHDWzKV20h1 KWdrIA+gpImdEcT7MCeO7cmg52OV29l8+x+mM/oGuqYZLXfa1JtaS+RQDkPsLb3ZZvvAQbx8zZk OxJM68jlcqH6dVPxPWFoQSOQ X-Google-Smtp-Source: AGHT+IEx+ANnkYfSAsAjHxydTAAtBt9M12WJreFy9bqMG2XSO0QA+Yiio2xXJ28N01qURnNZAEOWCA== X-Received: by 2002:a05:6358:e481:b0:1ca:a079:42f with SMTP id e5c5f4694b2df-1cab159b85amr817878755d.5.1733149488534; Mon, 02 Dec 2024 06:24:48 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-85be9087890sm179710241.25.2024.12.02.06.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 06:24:47 -0800 (PST) From: Ricardo Ribalda Date: Mon, 02 Dec 2024 14:24:39 +0000 Subject: [PATCH v5 5/5] media: uvcvideo: Flush the control cache when we get an event Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241202-uvc-fix-async-v5-5-6658c1fe312b@chromium.org> References: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> In-Reply-To: <20241202-uvc-fix-async-v5-0-6658c1fe312b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Asynchronous controls trigger an event when they have completed their operation. This can make that the control cached value does not match the value in the device. Let's flush the cache to be on the safe side. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e90bf2aeb5e4..75d534072f50 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1672,6 +1672,9 @@ bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, struct uvc_device *dev = chain->dev; struct uvc_ctrl_work *w = &dev->async_ctrl; + /* Flush the control cache, the data might have changed. */ + ctrl->loaded = 0; + if (list_empty(&ctrl->info.mappings)) return false;