From nobody Thu Dec 26 14:17:17 2024 Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) (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 6F0541A08AB for ; Fri, 29 Nov 2024 21:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915830; cv=none; b=oeHb33O8dBTOEiwaVSEYNUmDi947mTI5bpF3C1/wphYsQPe/F6Ue/brojKdtwucq8hlMB37+iB8UFcAP/leUdw4/bf2VLXExD66dxoLWYISpc6FoiutAHY/KfI2VXjYmftljIjvgMVcSO0t4kELctylKKn7SPsfXCHMu6Mg0LLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915830; c=relaxed/simple; bh=KDAOGjpXXULpZa75pLl+o8CodfY7IbmICZMYyev2FdU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ozSKlbrDJNyHnN24HIgllH16yCacEVBlQlCw1k3mFi5Avlc1dR63Tprr3XSqsKqYco7EIaeJ+jGNV0FmrWuuldU1HnXB0hOoAHUcfP27VNlyIdVHkeefE0cuiZcyCCl2K3p/NFqWgoErraQUXwWWGNkj2JMAa4O9mJeRNCwAliw= 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=NaYQzduX; arc=none smtp.client-ip=209.85.222.50 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="NaYQzduX" Received: by mail-ua1-f50.google.com with SMTP id a1e0cc1a2514c-85ba35122f0so182795241.2 for ; Fri, 29 Nov 2024 13:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732915828; x=1733520628; 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=DsG2Wx3W9iEMxWqh3g5yUw4V+bP3sc1QbSYtLT8mhKI=; b=NaYQzduXureuKtm8f+lz5Tvdh8IrdFxPr0YwAuFJoGNwuSH8Ir9lT11NE6ebrCz2Ts fiPUI+u6GObFm7qjuU93nToWOIdY0h/XCX5cXLy6aSp5P50Y2lPYeGdOzNlr1+Ele2oO CBQh2d6L7tT7z8CASI8UN6BAoIt4cfTHd3tJM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732915828; x=1733520628; 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=DsG2Wx3W9iEMxWqh3g5yUw4V+bP3sc1QbSYtLT8mhKI=; b=YEsrTlW+QqngvbTFZjfZGatX/OjjwVPPLxnLVJ/6YJxq1KUxACz5ob68AQ0+Qb8KnK VbZcIcpywyxG+bFLJEDx/TlrOGfoJHjgJhU3CAVbFL19hXh91vCKSM4Xv/1KoaI9f6TX RI+7Grd+52jGypsD7sC2x3CFD/s6F+BBmae8lWPJb/AViR0GcOVGDn9NuZC5xaZHHtx7 Z5ULrVK4aJUrCEf3CZt3nSUnRoO/u/fPQGoLbRKk+T1t2EwMXH00u9MXwhKId2ork2nZ gq/HEGRgZS8mbrniIOAIwdT8mjMtIP/DqIGl0mtqPIkf1MMHXUt3os8XGK0BkZEYWwfO TUjA== X-Forwarded-Encrypted: i=1; AJvYcCUaPIJHmzmd+1riC6Nsa9LzQHEjDJJIVcdJMdEBpEHFH++Ol733/VVq+5q4KGRbyyjYqngnoDGPtdNDIDs=@vger.kernel.org X-Gm-Message-State: AOJu0YymHBqdLKLAGhEMXEYnmtAVrZGaPWIcwPmkbSidWVZR3eFmvUgX /PHRkxgVjP4MPU4YAJ6UchpIpr+XG0wPtQZpmZDFxaXe6t6M+cInt/3b2CzjMQ== X-Gm-Gg: ASbGncsysngRLGNelwu2iWMeU3fCXqZWbdNos+IfvAny0W6H6Bh4f/Hf02p5EMX3syI 2HEc9Yfu5RJ7a7Inr73wXdRN5yASQ3JssBUpqdqcBcXGcbgllipJVLA4p2q8UKzG2fHxbLcKl3C 9hsizlk7zebnIpjV40+YmMfEAb8BuexN6/NJjNCg1vFB08z09WIaGJjDiG2IKSQCOr/gPVvYSSw Y/uq5c73TjwOzYGeogQUfAOLF9JXytzRSoSr7P5zFM7I/PqJNXd+aqhFAyK1+5ntkMe4Fjs0Uo3 /VFDIiof6qHKiK0qNcnoFN3p X-Google-Smtp-Source: AGHT+IH/h19gXrwsr/4Bm2brThGr7h969wtQPyxlHGBXmx03EjgzxndUgkQD4dm85b4dZ4/o0JrBRw== X-Received: by 2002:a05:6122:208f:b0:515:3bb5:5622 with SMTP id 71dfb90a1353d-51556a15ed7mr15838902e0c.12.1732915828303; Fri, 29 Nov 2024 13:30:28 -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 71dfb90a1353d-5156d0c1b7asm607254e0c.36.2024.11.29.13.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2024 13:30:27 -0800 (PST) From: Ricardo Ribalda Date: Fri, 29 Nov 2024 21:30:15 +0000 Subject: [PATCH v4 1/4] media: uvcvideo: Do not replace the handler of an async ctrl 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: <20241129-uvc-fix-async-v4-1-f23784dba80f@chromium.org> References: <20241129-uvc-fix-async-v4-0-f23784dba80f@chromium.org> In-Reply-To: <20241129-uvc-fix-async-v4-0-f23784dba80f@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 ctrl->handle was used to keep a reference to the last fh that changed an asynchronous control. But what we need instead, is to keep a reference to the originator of an uncompleted operation. We use that handle to filter control events. Under some situations, the originator of an event shall not be notified. In the current implementation, we unconditionally replace the handle pointer, which can result in an invalid notification to the real originator of the operation. Lets fix that. 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 | 2 +- drivers/media/usb/uvc/uvcvideo.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 4fe26e82e3d1..88ef8fdc2be2 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2046,7 +2046,7 @@ 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 && !ctrl->handle) ctrl->handle =3D handle; =20 ctrl->dirty =3D 1; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 07f9921d83f2..ce688b80e986 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -150,7 +150,10 @@ struct uvc_control { =20 u8 *uvc_data; =20 - struct uvc_fh *handle; /* File handle that last changed the control. */ + struct uvc_fh *handle; /* + * File handle that initially changed the + * async control. + */ }; =20 /* --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 26 14:17:17 2024 Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.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 2D7DA42AA1 for ; Fri, 29 Nov 2024 21:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915834; cv=none; b=ClstncJTpp1Xvj4ArWpYVnf/28zFTY2Ca4FLnCMLclKhTd56o1Yh4hSMq9IoDz1nKGPYGxMpYn91yeaDD5R4pGyjXDxhd5gelyrQKz4GDiCEoXSoNA8gSvlid8i5iSqkxZgmMCUzV5xWcP6niNGAjNeoYo/LeNwWGS1spYm7gU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915834; c=relaxed/simple; bh=+pfaMnSC0go4/J60SrpKpFXQ/i2qf8ZpJd+CtfqYHc4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WML/uS2yGChE83iddhtT+3/END6XkMOMrlTJy4UvdUkQB0Mo4dwi6U9wVfmjRpveNM1ZD4XFanaL96oD3MrHpAa9eG92Qz2H/zRtbf1Bv+4fnpYApjwfddFp6vIahbfR806OxJJpLQZoCim00fSNsqvI74xm1XFbQaoEkfjuNGQ= 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=meuxX1IQ; arc=none smtp.client-ip=209.85.221.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="meuxX1IQ" Received: by mail-vk1-f175.google.com with SMTP id 71dfb90a1353d-51526b9e341so562443e0c.0 for ; Fri, 29 Nov 2024 13:30:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732915832; x=1733520632; 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=GhCf5eirgTgth8XVE2W1qnK6YW57KSpNmGivwsRejzA=; b=meuxX1IQdfC4s6PO23AcZGaieysvEH88HOrPUrziIUJfjtUVWF+WGlOFSSlKjA4M6C gWw0POZB7PHE6Vy8m6SVrmB0gBi6B5mLkAlHKFMQUc2bhVVPTGb1m4mL0Da6g07LQ39d ibkiV7i+wGSwSa5cTnhkmYE2y6mW0p3DSF+mo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732915832; x=1733520632; 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=GhCf5eirgTgth8XVE2W1qnK6YW57KSpNmGivwsRejzA=; b=hIDsIqiZVH02d2+HWIVIxnQ3ewj7Yn+e9v1NjTYrz0cswUlEuzDXutaIIJqJ5mTqQj AFmauku25A4WglMmxFA7onm9gjtIsXL6dFwpHDhPYvrZgUkhJ11roM9NKGzx5MJYXrgv l1mCB8xJqszjnarzMBAE4ZgwvTf80GckTVvG4yJWP7AxpM02zMfyRxnTrwaw6wSS7Vhn d07vAp3qekoW37+9Nw+XVLclbwSGJ4s43sxGDhjlZrF5hrHrjPm1ncqVCO6E8Ec3zNHq f4hW4aOPDefDdtUk6f4Jm3zyIMkUUvpAZnGPAatsxBhywcI1XQNAP1z0tYTVFH9huL6A f07g== X-Forwarded-Encrypted: i=1; AJvYcCXxPvKy5HYgQue52EMEFZpyELZ+hEwAK+ECjdePBZgCLNd+0Jir3qL1tY6UnGuPOaOctAPsv6lBQR3AeBc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0LzgmEK1bb/MZVtBWb7wQnN08X4XQTebMWFJOU7KCZpNrUpSy 59IiNWy3GPQCFNV6AAQARtgFI+CN78NW0gkVWCynjyz0U8xwzQcUdaUPemLZcQ== X-Gm-Gg: ASbGncsuer0TU1FCuIDL/ZMUHJMsAO5AtmJzmHMOUwIP5i0eOjOAXDkeBBOHXDoKTi/ wzPmdPoKfjk04ju1ynIM2ftyQrHX20L7bmLZJpCA5RRs/Ub3+MzUuVSWH7FR8rlJ+s52c7eYmpI zPu4PpnCq3SWWGxjPBtPNWWLyxBnQS5sxJbboF71tl++546rfwibF9bypoqrzDLkKZpa0Sni1/P seyPgIcoXWdXhH/Ce2uA+8Hz3L5BZjJxTdNADjCjhsmG9yWtWJekFcEy1gR1aQbFv6O61G/3x3y nYjOwnZe92Nxk/I4jCvYNfJQ X-Google-Smtp-Source: AGHT+IFYwmDx0IKqcsATxkcItz9Kemn9Y5b19SBUmQymuvzPqTIPXsfSyh1fHAg0r6gBeJc73H4R+A== X-Received: by 2002:a05:6122:6419:10b0:50d:40bb:ae14 with SMTP id 71dfb90a1353d-515569e2f8cmr9832094e0c.9.1732915830592; Fri, 29 Nov 2024 13:30:30 -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 71dfb90a1353d-5156d0c1b7asm607254e0c.36.2024.11.29.13.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2024 13:30:29 -0800 (PST) From: Ricardo Ribalda Date: Fri, 29 Nov 2024 21:30:16 +0000 Subject: [PATCH v4 2/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: <20241129-uvc-fix-async-v4-2-f23784dba80f@chromium.org> References: <20241129-uvc-fix-async-v4-0-f23784dba80f@chromium.org> In-Reply-To: <20241129-uvc-fix-async-v4-0-f23784dba80f@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 | 54 ++++++++++++++++++++++++++++++++++++= ++-- drivers/media/usb/uvc/uvc_v4l2.c | 2 ++ drivers/media/usb/uvc/uvcvideo.h | 9 ++++++- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 88ef8fdc2be2..bc96fb475b9c 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1579,6 +1579,33 @@ static void uvc_ctrl_send_slave_event(struct uvc_vid= eo_chain *chain, uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes); } =20 +static void uvc_ctrl_set_handle(struct uvc_control *ctrl, struct uvc_fh *h= andle) +{ + /* NOTE: We must own the chain->ctrl_mutex to run this function. */ + + if (handle) { + if (handle =3D=3D ctrl->handle) /* Nothing to do here. */ + return; + + /* We can't change the original handler. */ + if (WARN_ON(ctrl->handle)) + return; + + ctrl->handle =3D handle; + handle->pending_async_ctrls++; + return; + } + + if (!ctrl->handle) /* Nothing to do here.*/ + return; + + handle =3D ctrl->handle; + ctrl->handle =3D 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 +1616,7 @@ void uvc_ctrl_status_event(struct uvc_video_chain *ch= ain, mutex_lock(&chain->ctrl_mutex); =20 handle =3D ctrl->handle; - ctrl->handle =3D NULL; + uvc_ctrl_set_handle(ctrl, NULL); =20 list_for_each_entry(mapping, &ctrl->info.mappings, list) { s32 value =3D __uvc_ctrl_get_value(mapping, data); @@ -2047,7 +2074,7 @@ int uvc_ctrl_set(struct uvc_fh *handle, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); =20 if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS && !ctrl->handle) - ctrl->handle =3D handle; + uvc_ctrl_set_handle(ctrl, handle); =20 ctrl->dirty =3D 1; ctrl->modified =3D 1; @@ -2770,6 +2797,29 @@ 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; + + uvc_ctrl_set_handle(ctrl, NULL); + } + } + + 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 ce688b80e986..e0e4f099a210 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -340,7 +340,11 @@ 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, + * ctrl.handle and + * uvc_fh.pending_async_ctrls + */ =20 struct v4l2_prio_state prio; /* V4L2 priority state */ u32 caps; /* V4L2 chain-wide caps */ @@ -615,6 +619,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 { @@ -800,6 +805,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 Thu Dec 26 14:17:17 2024 Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) (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 52D2B1A9B2A for ; Fri, 29 Nov 2024 21:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915835; cv=none; b=lEF3VMWdFx3dRc/8QtPr18wCTjz4Oq577S2Q2E6HCEThJUc8HhgGm2pI4VlOZL6zLHOvX1ENYxIno3qn3DN6QIRW5gphEMvprKRBN64G56Oydu3euyhVEbmbugOHtnTJMdDWW9dhzQrTEQEW90PZpAJmP9di1IQO8h/BHooFq7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915835; c=relaxed/simple; bh=hem3w0cqOpuUXnWOHaCYg59eIwff39vWTS7lxdWqD60=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PHNulWHpd07dVjZn2P8upp0k7GO01n4TV2grFnMwvs/T7h4kBFghBmEtZiOtm0b2nHpQETcFn+amUxj4SwGnEL7p8FEMaEb2Vf7J/TDRwt9ZU22Llij/eNuH+qPLGjawRG1mvIY3hZ+18mlo2fDpmer2CzSZ9eex106+7qsYUQ0= 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=e/8AYeGv; arc=none smtp.client-ip=209.85.221.181 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="e/8AYeGv" Received: by mail-vk1-f181.google.com with SMTP id 71dfb90a1353d-514fab8ac5aso494939e0c.1 for ; Fri, 29 Nov 2024 13:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732915833; x=1733520633; 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=W2rn5S7/m2AnqfUGp/AXrxEjHYa6ExomvekQA1z9JF8=; b=e/8AYeGvFl0mTTpkqIdVoIQlg7ntOEz9BgkVB+GNsqQQnOiS1b0UddHAUVy32Gb/3k Cxo7l7cHzHcv6+bm0aOE559bbAd5Xew5Rupki6+dM/QHnxU2kRBFLWpPLxBM6fuDjCnk j+3rkyfyyvR4GUpL/fXb5fFXq0bqsjzGO4RcU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732915833; x=1733520633; 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=W2rn5S7/m2AnqfUGp/AXrxEjHYa6ExomvekQA1z9JF8=; b=HOIWrrl6fVer6dSlrS9WrwBur18VxonuTcpOwWfiDOYgn2kGMfSK07nuvUNZU+jVSF P8q/gQq+vDrUwov5LtInxbGlHhVxvstiGq46fTsFGAEXBWMpV0nOjOGdEOR9jxdlB/9/ Ge2XiEEisr/DCzhjHBJthF8Yu7GsdILyHhpgQvbsRGU3Z1zbDf/hixH1AUZFg5rla2a3 LY5fcwae/klQvDLqgTYZfUDfgeXFJ96KpplIGNLN1eopTSVRFHuIEG7HfykRpJrGpdMT TQu4XuNHam3xtITdTAsUam1ck2J1XdjbpgOqcDpxaIeQ/YsaQDJ3De4ivVfPSo56bbCH YUgQ== X-Forwarded-Encrypted: i=1; AJvYcCWbIRdqpdUfq75rvZP8e3LNOzP7YYI/zFRQXk7vq4a4BablvIbHzL/8dILlUypffokcg82zmp/hP29nG9Q=@vger.kernel.org X-Gm-Message-State: AOJu0YweuXdVI9fmCbn9QkvtZ+JBh8Ha/cGYUMq78tE3kk8hCmgRU9R8 hs0VNTEgPQVOrK2kUVCkTk38AFWEamVIB/DrvvlMCN/xeSuJh8AojuNEfdM6tQ== X-Gm-Gg: ASbGncvhVEZTNNHoMvUqKwGAW8CUaNp/FeXF+k4cVZHYb493Up7OMDGYT9/ad6APglM wFe0+MaUD2+Nv2rJvDOcNmEd7XmR/tL5RwnK+MNeeX2dtwQNRTbCNWsL1SL46D5HvBr+9BL9e9H 2bWvV6qA13hvb2Ai/vgGPt8P0iEDDhKHUAV79U5wIxw3aXQpr9yxMru+cTUVKglB5K/N1jngvWj xghPKD5KdBFk9lLomQPeK/xs5XZXfdpiC3XFnB2ivSVNy0iOocDn77W8S9NAUDTuv24o7Ptvx8u yGP1wUVpB9zAZfNy8Sj2tsu8 X-Google-Smtp-Source: AGHT+IEcGD+/QiSnHqDspBxFeqf8V4eyWtSEYu06OHOVvuFJxL4mfm7VoAcu1T8tpb9Ahblgt2JqVw== X-Received: by 2002:a05:6122:6089:b0:515:4b68:c37f with SMTP id 71dfb90a1353d-51556926b00mr18430743e0c.6.1732915833363; Fri, 29 Nov 2024 13:30:33 -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 71dfb90a1353d-5156d0c1b7asm607254e0c.36.2024.11.29.13.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2024 13:30:31 -0800 (PST) From: Ricardo Ribalda Date: Fri, 29 Nov 2024 21:30:17 +0000 Subject: [PATCH v4 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: <20241129-uvc-fix-async-v4-3-f23784dba80f@chromium.org> References: <20241129-uvc-fix-async-v4-0-f23784dba80f@chromium.org> In-Reply-To: <20241129-uvc-fix-async-v4-0-f23784dba80f@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 Make it explicit that the function is always called with ctrl_mutex being held. Suggested-by: Laurent Pinchart Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- 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 bc96fb475b9c..e02540162dd4 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1968,6 +1968,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 Thu Dec 26 14:17:17 2024 Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.49]) (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 D3CFE1A38C2 for ; Fri, 29 Nov 2024 21:30:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915837; cv=none; b=AHfYgGe8SeeR6PipLaju2SfAtjjq9iH5y/xSkRNrURg2xEnAZyUnCKW4LVeNaS+25m8YYdCdwK+9mZm9c9affcyBK0Cz+DYXn+I7hLv/lZ9bb1FmCWzlhOqoS9aEsnGhgN1/gHUsiliyzTRLAfiADpHb5/AqfFXi1BELGUX3YiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732915837; c=relaxed/simple; bh=v5QezjflINmr1he5MndfMVx+1wL6381Mly0MlSiNytI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DLv0qib1586gJ3ybWLjeXmqJdetppK54Jm4YgAIQ0t5BIgTciin8RN82XnL9PNaORDMRWibmFKerObba4bTC7pC701b58KCV4r/sqQ8oUvum+XixEXn0BqGtj5B1qd2uQi4MZlZyoNZznPqp2SF0GkAdBsPIwoYndo2JZy+UG+Q= 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=VlOtASaq; arc=none smtp.client-ip=209.85.222.49 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="VlOtASaq" Received: by mail-ua1-f49.google.com with SMTP id a1e0cc1a2514c-85b88a685e6so439470241.2 for ; Fri, 29 Nov 2024 13:30:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732915835; x=1733520635; 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=ucJjvH6Z5O34BPMy+Kt0AFvVfn1owPFISOzjaTX5B9k=; b=VlOtASaqZgGUN69hfmv2Q3C06dVq6HZ0oZ5O9zpr4MoV8hFqszUHXMe2OlKzGIKatA 1qMmb5mBPkDYA9ueUHWJWUkIiyq4q9rkstP98TXzICFTZACTgPwYiIZtDEAiTkjFh8f3 kFhI7QEWuFM8VTt3AnA6iB2dXL141oLZcD4Fg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732915835; x=1733520635; 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=ucJjvH6Z5O34BPMy+Kt0AFvVfn1owPFISOzjaTX5B9k=; b=K9Wn+FAqKWB3Wf0uvEZ1zJhJv90vNC+aZFOs0ZMY7rqXpDMCzr+dEvfxHjg0OylIYQ H2IG2gh2vhM30GPLQTgp+vtHOtcuvv8tjGkEnwL+xGfUZRYwaBBUsT7Q54Q0GAlBnIrr 9HrKotAZO86SH7wDqLB5uG0hRHZOsq3ZJbPuYmt1D2ZhxyCkuMEAMV9IJL70gaMkOko4 YRWSf98k0hftfUkPD9u3VOXsKHIA8FUopFPe6HySyTk6a9hWjq3H9EyAUBGNt0UPrzvq gk0JvEZ8DgKmofUwMS4QZhC7GRNQIUvLdWzbd/AKgk+YTMLN2QhHLu3UGloa+2AuFuTS kV7A== X-Forwarded-Encrypted: i=1; AJvYcCXloAzrldLHa4nx1dw17Qxzso4RCrhn5TBPDJ5XjNn1L4pVf/HrNLm1ucwSd04kn5OxeCE3vGLr6l8pgdk=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6cWnKYPaWZ587elFjKD0G5e06mHRenKmxeF0MjqFlthoA94Eo VpY1Y8cj+IS30q0sFG35YwjgFQYHhbcPWz1694vua4pRf68InDwPJzBZzWmThAjBePgMeneFk6w = X-Gm-Gg: ASbGncvLN/6HUCqv/qdwvkPPtrRX2M2lPjQTky6oRhaKfY9g1QVg/dJHHpdD06IfJgT I0etrVqgMPKDefGuDn7Z4k/gMwDZTzmU15UahO61V+bUZdQiNgEw2WC/GbaN7PiLlHRhx6bd60W kh6MLwJkd9S1fFn+JMgOW31DZKkl7ReHgoYSB2iJzTO5YSZQ4oWt7uJyk+zzIS3Y0Nc5DNT4yeB ueTvfiGcQkQMUfGJBm/XtwrQgxy5P1Dft8ayuuwdtNWpCkKqHYQNyPUnOVQIuzPAnPpPTB1dR9n olxa27XiWF9m06nZVlPZ4yOX X-Google-Smtp-Source: AGHT+IH3VfM6LqkrJkK/UlQJJZ22q3iU/5oBBscMFmZZcqik+YSMZUFM/OEX7FkQUFRdN8ccT/KNFg== X-Received: by 2002:a05:6122:2a11:b0:50d:35d9:ad60 with SMTP id 71dfb90a1353d-5155692de66mr16955127e0c.5.1732915834862; Fri, 29 Nov 2024 13:30:34 -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 71dfb90a1353d-5156d0c1b7asm607254e0c.36.2024.11.29.13.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2024 13:30:33 -0800 (PST) From: Ricardo Ribalda Date: Fri, 29 Nov 2024 21:30:18 +0000 Subject: [PATCH v4 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: <20241129-uvc-fix-async-v4-4-f23784dba80f@chromium.org> References: <20241129-uvc-fix-async-v4-0-f23784dba80f@chromium.org> In-Reply-To: <20241129-uvc-fix-async-v4-0-f23784dba80f@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 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. Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- 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 e02540162dd4..8483e6760be2 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1667,10 +1667,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