From nobody Sat Feb 7 09:29:25 2026 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (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 7CDF91FBCA8 for ; Wed, 27 Nov 2024 12:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709700; cv=none; b=ROKcSgA6auLpExHfxypgq6jD6ZpviWVXG6xdzOA7DUAJGtt3gl1HtHtJmJHtafVNmEt5d8fzrc2/dtxSxpr4yMWdpjOKCndM3ChJ5lNRer1TuLY2DxoSL9ApFWRDWN8+HTcmKiq/t2USP+7WMKpTuCyMVWpcL+8f5RRwzvjrNVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709700; c=relaxed/simple; bh=WhdTkzcqR6Bf+l9KubUuR4/DJ8IIJcn0RVpx0dWpsR8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gkoEZU9DzlMizPZ9VF9kd/uTfpOrpIZY9keMMS5SrinA2RBklpO+7a45O4YFxb/CBy/1gJlxj5zy+bh6CDA72HtXZ0dOdjQ5brDqvjRjFP2Q2pFbd0HnNfK5xAGuFLgCVGLx4aSWf+9/5XdrQvhBDwQQfiyufBFJ/t+a73p2yak= 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=Y+UqrPhQ; arc=none smtp.client-ip=209.85.222.174 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="Y+UqrPhQ" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7b65d1c707aso280605085a.0 for ; Wed, 27 Nov 2024 04:14:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732709697; x=1733314497; 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=p0KHNn4es9DIQwBkLUHR0O3A+08DvzwFXH+1YhEGXA0=; b=Y+UqrPhQAPtBgpBCqlACR9fj87wmQeEX5Yd2Vuj6MGOrRL8wYIcQU6cKY56Kn4oIaF 6Af93lMpqLk2qt2+C64L907THMur6bxxzVe9SBUvPn7Tcf0cykoOPpzjdbafFNYEIM2f ILPzsnQg1YsCoAMWW+WCGq3y8nyOCga2BlPao= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732709697; x=1733314497; 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=p0KHNn4es9DIQwBkLUHR0O3A+08DvzwFXH+1YhEGXA0=; b=Q+TSL878wWpOY1mJM1pa39pq7YRfjEppTa0JGN2zNjMQPuwhXdw+4eVjk0XXN8JN+0 y9Vts7RDFgkxU95joOXNnSosHA/AZKWar3UuowQozdhexoaTKHKmtPGPyZ5tpZEAayME 6OLrkyN6PEmnAzL8UIxOmPanlMNPNk/mR87iJ5k8bGTOZMIewb6jc4xzgz5D4XP8YHhQ a644QTAb/aQFvDk7d11Ja5ST9qU+1UQG4gY8/iWOXmvg9gaUDDLxPsT4zFfgf3kCrNBU tlVm5auT7zUUcbSnCaLSa5iqeWif2Oo0eTuNUg1p1pTAFLpcb/EeYa+6w0AnlHJ1fh3F Kd8A== X-Forwarded-Encrypted: i=1; AJvYcCWO7ZEvzLJBry/dgvedrCVAA9fy4hXwGPICfUxS6B3h0az3ICUy+RieOChYey5gqT2uMC6aliZgAs6hVH8=@vger.kernel.org X-Gm-Message-State: AOJu0YxAvwCQh5PE2Ef8JRbClf7wHATsw07wkBmY80JDMPDr72/1/WiX scDg3L1tMFFTUifdjicD1GrgMPZQH6TYdIZ15778285p9nkPKNguaIF6ymW3+A== X-Gm-Gg: ASbGnctbO3heFMXk0E4MNT8AUbpTGsvAzwX0oNcKt11SUUgVwrXU8OxZPkyI0FTzryw 1YQrThqQdGKSD0ZK1KD7zkZf62CLkeXSrCSw2uGW30Bo738g0B/KzBXiEah3a2SdNQov2gE0BkJ WR70eanBmtkzURb8TWfVclCwI35m0UjNhn7o9acfDELkT+p3E8rvddA86YFhlxpr4sG955//vQ9 FL1nJDb9inbSCna2Wl0Ojsxtw099m/0XMSomU+P4qOeUvMceXXwgC6iUKjuc/Tkz/siECqH/Fht 9rY4J142DtwsTtMv7fMxOjvi X-Google-Smtp-Source: AGHT+IEdu8deXp9Whw6D3ODj6kf5vf4xXQ1BzDm2O19GNjsuQS6uwUGVVt/ypGSUyCnQ8eyQm4KPdA== X-Received: by 2002:a05:620a:4095:b0:7b1:4b2e:3c0 with SMTP id af79cd13be357-7b67c263e59mr439636385a.14.1732709697396; Wed, 27 Nov 2024 04:14:57 -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 d75a77b69052e-466be77cf7bsm371171cf.89.2024.11.27.04.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 04:14:56 -0800 (PST) From: Ricardo Ribalda Date: Wed, 27 Nov 2024 12:14:49 +0000 Subject: [PATCH v2 1/4] media: uvcvideo: Remove dangling pointers 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: quoted-printable Message-Id: <20241127-uvc-fix-async-v2-1-510aab9570dd@chromium.org> References: <20241127-uvc-fix-async-v2-0-510aab9570dd@chromium.org> In-Reply-To: <20241127-uvc-fix-async-v2-0-510aab9570dd@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.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 | 38 ++++++++++++++++++++++++++++++++++++= -- drivers/media/usb/uvc/uvc_v4l2.c | 2 ++ drivers/media/usb/uvc/uvcvideo.h | 8 +++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 4fe26e82e3d1..b6af4ff92cbd 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1589,7 +1589,12 @@ void uvc_ctrl_status_event(struct uvc_video_chain *c= hain, mutex_lock(&chain->ctrl_mutex); =20 handle =3D ctrl->handle; - ctrl->handle =3D NULL; + if (handle) { + ctrl->handle =3D NULL; + WARN_ON(!handle->pending_async_ctrls); + if (handle->pending_async_ctrls) + handle->pending_async_ctrls--; + } =20 list_for_each_entry(mapping, &ctrl->info.mappings, list) { s32 value =3D __uvc_ctrl_get_value(mapping, data); @@ -2046,8 +2051,11 @@ int uvc_ctrl_set(struct uvc_fh *handle, mapping->set(mapping, value, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); =20 - if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) + if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) { + if (!ctrl->handle) + handle->pending_async_ctrls++; ctrl->handle =3D handle; + } =20 ctrl->dirty =3D 1; ctrl->modified =3D 1; @@ -2770,6 +2778,32 @@ int uvc_ctrl_init_device(struct uvc_device *dev) return 0; } =20 +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 =3D 0; i < entity->ncontrols; ++i) { + struct uvc_control *ctrl =3D &entity->controls[i]; + + if (ctrl->handle !=3D handle) + continue; + + ctrl->handle =3D NULL; + if (WARN_ON(!handle->pending_async_ctrls)) + continue; + handle->pending_async_ctrls--; + } + } + + 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_v= 4l2.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) =20 uvc_dbg(stream->dev, CALLS, "%s\n", __func__); =20 + 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/uvcvi= deo.h index 07f9921d83f2..c68659b70221 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -337,7 +337,10 @@ struct uvc_video_chain { struct uvc_entity *processing; /* Processing unit */ struct uvc_entity *selector; /* Selector unit */ =20 - struct mutex ctrl_mutex; /* Protects ctrl.info */ + struct mutex ctrl_mutex; /* + * Protects ctrl.info and + * uvc_fh.pending_async_ctrls + */ =20 struct v4l2_prio_state prio; /* V4L2 priority state */ u32 caps; /* V4L2 chain-wide caps */ @@ -612,6 +615,7 @@ struct uvc_fh { struct uvc_video_chain *chain; struct uvc_streaming *stream; enum uvc_handle_state state; + unsigned int pending_async_ctrls; }; =20 struct uvc_driver { @@ -797,6 +801,8 @@ int uvc_ctrl_is_accessible(struct uvc_video_chain *chai= n, u32 v4l2_id, int uvc_xu_ctrl_query(struct uvc_video_chain *chain, struct uvc_xu_control_query *xqry); =20 +void uvc_ctrl_cleanup_fh(struct uvc_fh *handle); + /* Utility functions */ struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alt= s, u8 epaddr); --=20 2.47.0.338.g60cca15819-goog From nobody Sat Feb 7 09:29:25 2026 Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) (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 B4F521FBE80 for ; Wed, 27 Nov 2024 12:14:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709701; cv=none; b=R3MseO0xuPW3HmRHxVLFokUcf2MHOx3wUlpd5TPt5y8fQ42upCVkvIe0vXYXT8mHqT99LNKpxvceWrfyzhEWxvMR5+pu6KoLOtifCsgVEZgYHNuxBpoPg5Gd9PU6q5sKRnmFtsQdkX7lRxxl+sL4WBUDPByp2G4igzR3uAc6/7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709701; c=relaxed/simple; bh=VcsvfSq12DS0fnYrIgZKD+Xjd35yhix6s3hD7aEJjAw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YbtjoqIQu4DzKBOBCKzc0tdLMpbSTVOoTlvrcgoQApIz3LOSSk6Hp+BaRKhoqES/iBeeAU8XXRczTPPxlkOZIayibGa+jpANAmxLmaeXhHoIaxrMbAYYJAdOCjC0+euDxg9UEBWEQ+9JwGZGuXkr+YODX8U4iJHP5emj7nyICEE= 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=X5pAqEZf; arc=none smtp.client-ip=209.85.219.182 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="X5pAqEZf" Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-e3882273bdfso7071394276.0 for ; Wed, 27 Nov 2024 04:14:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732709699; x=1733314499; 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=7nuXBj4+Zy+PgIyL5ZNHJXV9meQjmyhtl3lnhIKUIXQ=; b=X5pAqEZf+zMnnErlWNuJLro7DwZWjwm90MDDu+qimjLlhAqD3eNN/YTh60zN5b3fIE /1wLi+vhJarn5TqgvKjIA9JG6nmTvDqB24CRYDzg77tkElUi98gSnSaP+IyzC2kJc/Kr SKagbPKh5/ap8i9jcKQ8xySS0ZXLNkTSvrqUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732709699; x=1733314499; 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=7nuXBj4+Zy+PgIyL5ZNHJXV9meQjmyhtl3lnhIKUIXQ=; b=CPv+izOWajqyhWZwfEz3fZuI+KVnYC9Zgj3zrDQQIps3s2ah860rW1YucqYeOhtYnK J6taF7CTYhWG38HcFjUiLoOYgk32aiu0l8n2i/DBiD6k+vENGqGMwA28LkVK7Yu2vk76 LuxDJjKHimWDlQJS4U2S6gf6eRAybHeoeCI7Lr56Ro2uTmGARxZjtlsXX7F8T76M28oG J2Zx0OSlQOFPsrwOaCHXwKtmNA5Gqkmi2MlMuqc0Pi8m+TARq293k2fe4WkWCLfNTFuH 2pEzxrbxE9DZG861O/j4XHp5w/a5rPUuQsLmaCXWv3PmIBR7yOqkrqlBRw4omfP1lfha eQzw== X-Forwarded-Encrypted: i=1; AJvYcCViOtSo6IHqVoMWhwofD5qb2c8Kcfdn6IKwhgOoPTkYG9LgdPPZri/dREb/JXPBpWNTjnjc9VtTxGGEww8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzirpb/fhxpQZ7R/7vL2H39m1E21gpnb/zuWFEr6fDDWvU1TsIS 2FSRVRgkzJCtbPy2VMY2wFC55Be/JRUjjcGeF9931XKYXJk65q+f5E/EYO2GIg== X-Gm-Gg: ASbGncsfnCVZM2MkdQ6P8HipYcVp95HIAUX+weGaPA8FIH1lfd5OhjyGgJhRgB3+Mmb PReASK/3PyVwz/BB0AGD0ozdm9mmNxIUbwDhdCC8TxdaeZtbPgOC2Ptxe+mrd0KC3WUxWtxM97y +lQ6/5pi0AevLsUpugCMroUhJTS0r/M+fxE3EcfSXKuFll9wQ+KjXrM4qBTgpZT9m74/7u6CrhE ESSnGwCHRkfXFNMpVPCklrAMgXc1aAmOtXPDF+giGg38FvyDqnrU9SLc7cnDe7dwMyS2LRzZUcb 4T0oyYPQakW/Ty6Kj20xUCN2 X-Google-Smtp-Source: AGHT+IGLxdpsvDUuDyS/a7VxdrSBPvc4g30hV96tMr/MAEAPEAJCmKtRun3PxzyerPPec80HnLUxYg== X-Received: by 2002:a05:6902:f81:b0:e38:9b5f:58a6 with SMTP id 3f1490d57ef6-e395b957461mr2580029276.46.1732709698809; Wed, 27 Nov 2024 04:14:58 -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 d75a77b69052e-466be77cf7bsm371171cf.89.2024.11.27.04.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 04:14:58 -0800 (PST) From: Ricardo Ribalda Date: Wed, 27 Nov 2024 12:14:50 +0000 Subject: [PATCH v2 2/4] media: uvcvideo: Do not set an async control owned by other fh 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: quoted-printable Message-Id: <20241127-uvc-fix-async-v2-2-510aab9570dd@chromium.org> References: <20241127-uvc-fix-async-v2-0-510aab9570dd@chromium.org> In-Reply-To: <20241127-uvc-fix-async-v2-0-510aab9570dd@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.13.0 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 --- 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_c= trl.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; =20 + /* Other file handle is waiting a response from this async control. */ + if (ctrl->handle && ctrl->handle !=3D handle) + return -EBUSY; + /* Clamp out of range values. */ switch (mapping->v4l2_type) { case V4L2_CTRL_TYPE_INTEGER: --=20 2.47.0.338.g60cca15819-goog From nobody Sat Feb 7 09:29:25 2026 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 4E3901F6686 for ; Wed, 27 Nov 2024 12:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709702; cv=none; b=L0IdSWRgLJh5UVunzDDDy96xOoOEFJK0NZZKy0zF1DzWxWgEHUuK2RFdW3spYRZJR54Ft3yG8hRGjXLKl3/Kc2i5V3kBiZ22wPZgFsF85Ctgjzzrt3Vsn8FQdVDzC7vkVYqEHJTc+SQwArbr44DShvf3xU9ap3XIUgQ1r7xCdxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709702; c=relaxed/simple; bh=qscvc4/+8WAanATzK91OtjUbi7ikSGl3avQzHX8sCU8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PH+q2beqd+YnYqgncNr6dTrVD8ve+ImANBJCj+q+7kQlzb6+7tM6qWV2TH5yFGDwuagP0wXglJz4b/Zf/EZwVyOjNZ15Dd/ajZw96kMYeRAjMMb46xI/CvPv4pkDhQeIvPpySJHrlFHW6vJoBI+oK+t60kgN2+Z8p0rSK+r5meU= 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=NyzKEgCq; arc=none smtp.client-ip=209.85.160.175 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="NyzKEgCq" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-46679337c24so40140371cf.3 for ; Wed, 27 Nov 2024 04:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732709700; x=1733314500; 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=lkd0hfrtGi6wFG+eppx3CwdzsgWeJcO0RuYZmaKBy34=; b=NyzKEgCq8Wq1LGDpojFYKQpXwY78+p1Smzh8OPbK8G3A0e24oBbEs5KACNH+gHCigf 3mdSo+7yWgpiR842B+/p0d7uqGRTAqUUnk7inw1M9PJ/7ahVbgqIRJqlFINF/bu1okuz mIN784VoxApKOZ8sZADAvdQ8acfofy8r8PoDg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732709700; x=1733314500; 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=lkd0hfrtGi6wFG+eppx3CwdzsgWeJcO0RuYZmaKBy34=; b=F8wq6JOR/dSBAAu1kpR24qJf0tQj1V+sfuFUbEUEjZWCw5Nu8r5QomxHrJqU4erYD8 7cuyp4dSdBrPfcDxd+JOR/B363aBpJLNW8z/Aupxhz1FQqtd0FuX1swrFj+/kpsVaEEf OSuhJ7dBy8Gw9538H3BdUyii7Lo1vewgP/I6kEwUHfTbHO8cBjLazE805vLrdIMt8Tsl aNiorowV08Hbf6XQZ4pnwmSZxzbH1bRhqpK2X5wglb5shxpV0gSrYSS2dWsmC5/g65ht UNPv2wCeNXIZm1pa8TaJ+qoSQMEnzZSbhnO7YupXmbl2xe/pI2XmPcJx6WQUdScslmRi 21mg== X-Forwarded-Encrypted: i=1; AJvYcCU56yRzoYom73hxvLz/8D7HXF5gqvPpyCqBLcSSUO6Tb5BGvOthACGebGzrU0rJFnkRRs9+JQmi7RujQmI=@vger.kernel.org X-Gm-Message-State: AOJu0YzSLbq1JFs97/UDg/OCMAZI84cXJ59QUIBb1RtJDKFVTDySmwJl 5Mssd7zs+btDyNWO6jloVGJl3+c9CKSNMq0Q0Jo9LJMoPe58qPozBpx4DQhuxw== X-Gm-Gg: ASbGnct17VcPigKG5YFgtLXy5VM43O5G5VQ1ZL0eE/aEAQzwNcAC778+WWFZdiQASEn JPlphmkPS7O58ZCOEdsAYoMoCxfZrds2Qjlm6lqgOjsP+HjGAlSGUT3i5R2gQnW131UG08QC1+U cfnsbwEqCkvy8aP+dZ/UbGtkCQ9G0SOBT0KLtq2c1cIba6Jfht6jUQShnE4IN0SV9t9nH62xBez oLBDG6iZpzcd7/bYNlWbu+vpLJeFu9Z4Z/gEUo6d2eY7yx+cbD+XPPgyg40BMTZC77S9BYGH3Ar djCL6gPdgBb9DLrmYB2BC9oC X-Google-Smtp-Source: AGHT+IEJp12s0m0Yk1hs2ex6FW8MZF5oXzJGL5WHwF8YV678OPemZ9ffP4a8dvh2jsPCipIpLWswVw== X-Received: by 2002:a05:622a:14ce:b0:466:8543:b96f with SMTP id d75a77b69052e-466b34d362emr28958981cf.6.1732709700243; Wed, 27 Nov 2024 04:15:00 -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 d75a77b69052e-466be77cf7bsm371171cf.89.2024.11.27.04.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 04:14:59 -0800 (PST) From: Ricardo Ribalda Date: Wed, 27 Nov 2024 12:14:51 +0000 Subject: [PATCH v2 3/4] media: uvcvideo: Annotate lock requirements for uvc_ctrl_set 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: quoted-printable Message-Id: <20241127-uvc-fix-async-v2-3-510aab9570dd@chromium.org> References: <20241127-uvc-fix-async-v2-0-510aab9570dd@chromium.org> In-Reply-To: <20241127-uvc-fix-async-v2-0-510aab9570dd@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 X-Mailer: b4 0.13.0 Make it explicit that the function is always called with ctrl_mutex being held. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 3f8ae35cb3bc..99ddc5e9dff8 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1946,6 +1946,8 @@ int uvc_ctrl_set(struct uvc_fh *handle, s32 max; int ret; =20 + lockdep_assert_held(&chain->ctrl_mutex); + if (__uvc_query_v4l2_class(chain, xctrl->id, 0) >=3D 0) return -EACCES; =20 --=20 2.47.0.338.g60cca15819-goog From nobody Sat Feb 7 09:29:25 2026 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (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 722941FC0FC for ; Wed, 27 Nov 2024 12:15:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709705; cv=none; b=DmuR/TRRpntwQBIZpAlAGMxXQPClG4Lhshd3UrA2v/znx2TKmx0eV23G7hh5cHRK4uskjjEgx56tffB/eDbvgzgm8XpPs49v63RUzvOgGtuMrx+zqLfBQ1dT7DEaUXEJvjdwOykNOJy7V24N+dupPcFS8oaDffQd5OBGq+4VgBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732709705; c=relaxed/simple; bh=yv3h2vzWiCSkYvOmOVZOnLbH4e+vqdmkttphrGsTdA8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X0cc/34E0yU9E/OiyjAef+epWPuKn+m5UxbmaIRWLLN9XHwCcUpGiEAGn79Vaw/8I+Gsq5DRYdAxYWhZ2Jl0a+4f1Y4Sb1fK2Bd9CInieUIsIspHQQ9c0yCKsAuEWocUytFLG1/0+RXeuvzh0XVpJ/z/NTeDECWK5xZBUMD+JXM= 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=U+p2X9wP; arc=none smtp.client-ip=209.85.160.177 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="U+p2X9wP" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-4668f208f10so27634601cf.3 for ; Wed, 27 Nov 2024 04:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732709702; x=1733314502; 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=n6PMrA6yfmsQRKTdt+5BI8/0Y5GUPe75YZrlJGsNn64=; b=U+p2X9wPu/UMKCx3VFmxhdXB1oJWwXW2/deneWXnmYZIQkCbLIB31/26g5I7m49Vdd UivIN4yzh6Bak0ZPALYFBocZm8+pWe5XM1wATMbuQQ1I67HCA6eu3CINNvoMD/8o+i8/ ZxQOF+qi0w1t1pQMks7vO3NR3xMColOXr3MzM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732709702; x=1733314502; 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=n6PMrA6yfmsQRKTdt+5BI8/0Y5GUPe75YZrlJGsNn64=; b=lSl4OV8QcnW+NiWm189aVs8fS6RwA94DsIBFtK0MKwLUeWDdknhl6NMt2ulJyXBUuX FSS5MPB6Pt3dzj8/pCfIn7g8vqZz1LgOt0OQqiJtPh2BHB8DbkEB75bVWjoz8zZgEQ3P eoxFu2/AREi9hPKWDWh9oYYrmoYXn2erDuu4+dOeyu1Ge2MY7dBlzZLfONd40ZgLyH94 HFTWInWzfmyOAtQxpY2OiRAt5jd5ZhbCArq3xNCjFE9Sp/l/Ue1tg8tdA7gE2dXuh0rP 7/akYoovBmSWpo7gcOzYOjZASPsHdTl2VW+OF+xbv9+1UZu3x2PA0Gzc2Or44Y1fF2zf JNQQ== X-Forwarded-Encrypted: i=1; AJvYcCUDVuvvkTkEzPOWczQCIYBI1/0Op/NVr8CzfppSWTHTINAicclPDq5VKlVCt3HIYjG6/6Zh5lv0LowmMmE=@vger.kernel.org X-Gm-Message-State: AOJu0YzMqjPFzzi3xPu/fTCiWV46CeZ3781MOp+PhjwYeV9UIuRMoiN/ W8xSM3fHgHx44ItTpSY0jin4wa79QYCW2825dhyjsm6M5tI9IOxiWUdrsyzTJg== X-Gm-Gg: ASbGncuGVquRGvUI6Ebl1YWBTEYQl2hGSGRNHBXfSZkOZFjk+N8wGgtTzD2POjfSZNW Nfef4uSTZe9mh27wz7QroEtysUvJpt4ly28yRpvLZqFEQfhSEHSLfds034hySno2vaMhP6obje/ vUjyHAfWLUqi3zxXH4GAmyphDsN5ugAaP2BWOj3UQnO6FXXWAZreLTuEBynPDv/XmieV0DNGL2F VWFrJ8DzQr/I/rWCc1OooRcpRv7tpc8XvT3cUzy3vCo2eN6qe2RFIkjrQGqtw9p3mZNdC74vfet k6tpf6L/09oOXDSgQ1QvknYJ X-Google-Smtp-Source: AGHT+IHf6ueSfY60U0HfefcCmnZQ367u8xLsUq+kt1ZVbjF6qn5g8wIQB2Z8/Cf0NEGUz/Jw+SbagQ== X-Received: by 2002:ac8:594e:0:b0:460:ad52:ab0d with SMTP id d75a77b69052e-466b3516358mr37080091cf.16.1732709702235; Wed, 27 Nov 2024 04:15:02 -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 d75a77b69052e-466be77cf7bsm371171cf.89.2024.11.27.04.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 04:15:01 -0800 (PST) From: Ricardo Ribalda Date: Wed, 27 Nov 2024 12:14:52 +0000 Subject: [PATCH v2 4/4] media: uvcvideo: Remove redundant NULL assignment 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: quoted-printable Message-Id: <20241127-uvc-fix-async-v2-4-510aab9570dd@chromium.org> References: <20241127-uvc-fix-async-v2-0-510aab9570dd@chromium.org> In-Reply-To: <20241127-uvc-fix-async-v2-0-510aab9570dd@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 X-Mailer: b4 0.13.0 ctrl->handle will only be different than NULL for controls that have mappings. This is because that assignment is only done inside uvc_ctrl_set() for mapped controls. Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 99ddc5e9dff8..b9c9ff629ab6 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1645,10 +1645,8 @@ bool uvc_ctrl_status_event_async(struct urb *urb, st= ruct uvc_video_chain *chain, struct uvc_device *dev =3D chain->dev; struct uvc_ctrl_work *w =3D &dev->async_ctrl; =20 - if (list_empty(&ctrl->info.mappings)) { - ctrl->handle =3D NULL; + if (list_empty(&ctrl->info.mappings)) return false; - } =20 w->data =3D data; w->urb =3D urb; --=20 2.47.0.338.g60cca15819-goog