From nobody Fri Dec 19 04:58:03 2025 Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48]) (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 254E820A5E7 for ; Tue, 3 Dec 2024 21:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260821; cv=none; b=rlK2KXfFvjVPRkzd2RHZcTHnzXRjQAG5e2O03L3iEBMdgn6nxOLtPalLmYI3KlvC8nD22O07LdZ99J82fEuKa3Or0q6Nq9Wx0CMM3P9TdXAfT0Iwy0r0TJeH8xqly2qHU27H/a5c23KIYBbN1ifjrKsYCUjI7nJQSTz+0o/FYtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260821; c=relaxed/simple; bh=7mCRueWRTLrrGtLhTrWTfJrRJJeyxio72U+xB2LFHbE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LxUWl2RbuAFCcOf8TkegGVJN7kVmJFIUaIBm5DQagUNOU+0jVN9kW89Ymf78O4PtQEpHWW2yYgnM3xVjbNqHkKvBAiUv9CxhnCh5CxRnAoWG5o5eoXp+6/JQ6QURrUofL8sUQJx/mr2kVWxwbGy/Y4nmaDN1vVEvtQmML/uN6W4= 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=gUrKRpxU; arc=none smtp.client-ip=209.85.217.48 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="gUrKRpxU" Received: by mail-vs1-f48.google.com with SMTP id ada2fe7eead31-4af10fcf22eso82766137.0 for ; Tue, 03 Dec 2024 13:20:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260819; x=1733865619; 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=nOOe/WRZagmMi60fK6VqlpT1825okMetV6N8Itrt7Mc=; b=gUrKRpxU6EkNh4vHEcfwnmHu/m5hvanTzMo9A1zIUfBYmGDA+S6xLJX3/Ku9+lWBmG z04PkCjd7l0drl9qQ0ZbEtHw0E5BfBOfVU0zx6NpY2/RWOmfk8ggkMQUja5VFqkM0L3P +afi/E48bmAE8OT1ag/ZlWFhUo2v8b5SVYbVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260819; x=1733865619; 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=nOOe/WRZagmMi60fK6VqlpT1825okMetV6N8Itrt7Mc=; b=EStFQzdIZBaRLWLcgqKioRxfqSqkycJp5yQPu+JxQLEtAVNqG64CLc/RWHTmUwZQvM BW6arrXIc4KUxL79F5EGhA4N6sje0c5vNGSm6z1GlBExnaYuJunkpXVoJqHE2UCjFnC/ AmhM+Je5UFwnthvxVPfF4Bc9GoBTxT2ybPGq7V64GQlNvXT/6nODLejns34TER2m+Cta 9cQU0nTD2QrKNM0NHrOWXGVYwXIgoHAfJ4zhO+33uox4EpcWNhTtJEmaI+bsncNIX2Cn YIJphzUPOJmDdZ7EXee54bsIGmOCUPBwZPC1dw6RKhLGSZGoJ86RTxcSuq7W7ZQ874Ha Ba4Q== X-Forwarded-Encrypted: i=1; AJvYcCWxfhKbaQyk29hlfttGGNFs6ltsxioctnMIt//SA6K2BR75IiihxPUfwRTku9++tysIURvAb5JCrwdHuUI=@vger.kernel.org X-Gm-Message-State: AOJu0YxegMrM7yAYO7EW+tOi00OVll7MpfOipKAykK45P+GWU5pXPx/R tcEqeqx5Ipe6vyUnjrrcUtMt3OccQXaEkfmECziMmHKDMGrnsmNkkzagbSOEpw== X-Gm-Gg: ASbGnctC+Xs0N/o+2ICkZIWOEClNzmEDStmBmeNS6QH+iCi4eybBu9OAsKqkzjiKd/d LxMORh1kqzIzw5m7mcX/HEWDUizTct13vbcsPC3VzhfBH0ZZNsA6XRIQJ60YpdzhDzV6To+/17g xCAJ8vneLFtxJEM0+9bjlZqiAX/m2b/mZ+UP3M1EoSJ79oHjihlA+zui2jd2vtDfIPOSDkAYv6H vQkG57FIsKJ86gIVulBcq4KYpWlLtTR1I6zYYdWoBx61UTxJaABS4CIcJZNFBl82PM/ikC3LSGd H+Fs62ygwt/w0x03Ol0bFZd1 X-Google-Smtp-Source: AGHT+IHiizhG1r48NiSLYamAD0KEtJnCWIjp3L1I6RSZUBOGagQM6jryT2Os08sSfMtFWidXsF8z6Q== X-Received: by 2002:a05:6102:2a7a:b0:4af:5634:d26f with SMTP id ada2fe7eead31-4af5634d73dmr23535275137.13.1733260819058; Tue, 03 Dec 2024 13:20:19 -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-85b82a89d5csm2140364241.8.2024.12.03.13.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:17 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:08 +0000 Subject: [PATCH v6 1/5] media: uvcvideo: Only save async fh if success 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: <20241203-uvc-fix-async-v6-1-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@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 Reviewed-by: Hans de Goede Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- 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_c= trl.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) } =20 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 =3D ctrl; return ret; } + + if (!rollback && handle && + ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) + ctrl->handle =3D handle; } =20 return 0; @@ -1895,8 +1902,8 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int roll= back, =20 /* Find the control. */ list_for_each_entry(entity, &chain->entities, chain) { - ret =3D uvc_ctrl_commit_entity(chain->dev, entity, rollback, - &err_ctrl); + ret =3D uvc_ctrl_commit_entity(chain->dev, handle, entity, + rollback, &err_ctrl); if (ret < 0) { if (ctrls) ctrls->error_idx =3D @@ -2046,9 +2053,6 @@ 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) - ctrl->handle =3D handle; - ctrl->dirty =3D 1; ctrl->modified =3D 1; return 0; @@ -2377,7 +2381,7 @@ int uvc_ctrl_restore_values(struct uvc_device *dev) ctrl->dirty =3D 1; } =20 - ret =3D uvc_ctrl_commit_entity(dev, entity, 0, NULL); + ret =3D uvc_ctrl_commit_entity(dev, NULL, entity, 0, NULL); if (ret < 0) return ret; } --=20 2.47.0.338.g60cca15819-goog From nobody Fri Dec 19 04:58:03 2025 Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) (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 348EF20ADE9 for ; Tue, 3 Dec 2024 21:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260823; cv=none; b=L84uhqJR014F/3XV2A8ssdXpO2dgte7Pa2EhgdZFQeboT86rsUi0s2AplSxaZ8SFGTpBywu8RGEkbgeZWVFAeQ9rmBzCTcvN19Gn4Gy26F+nUHJsDw7fmiTwpUQoSbmv8biSXnqAAjFX4MTbvmBHvtxhx+7u1D9I0UdsnNK/z7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260823; c=relaxed/simple; bh=l4/lhwctK3kBC3s2JyaOOWF9ukBbTcldFztSXBtwWD8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cGzvyVOqSnxQAv11AXz+/4iFf+JR1Rm9H2SqVrnl3c2eKAuVqasR5E6n/qBqhQlve5uwN1ZdH3prP5WsSqzsaAtX4TKyBdNNtEUa49T3e05iiHAWsZtZNH5eaLbvNPjmNunWIaerQXfReTeaI9xxtpI0eOTrit0v1IEVJjv98hI= 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+E6Nm1h; arc=none smtp.client-ip=209.85.217.54 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+E6Nm1h" Received: by mail-vs1-f54.google.com with SMTP id ada2fe7eead31-4afa4094708so148229137.0 for ; Tue, 03 Dec 2024 13:20:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260821; x=1733865621; 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=nL4Atu/0WT3Bi8AnR4uXCq5U/XlhAxlSF0B4ijqZik8=; b=e+E6Nm1hFjwqcRGOb8qFT7tP30MVCZ5B+SM3iPDu9n3QNPvXzjxd1FrRbPpgbWkJ2+ UQRcB7vnhSiW8iDNOGfhOXGnvMlywv8romtCbY4/Sxd7jBX8CozCRYEuXKIjGLuPIjg+ T91RF4uUsqLpE+A9X3QSjA8e/9zqooMdpCNlE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260821; x=1733865621; 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=nL4Atu/0WT3Bi8AnR4uXCq5U/XlhAxlSF0B4ijqZik8=; b=pfKYCwXMVWmqvLRaT5oI1AaHar5d3vsaDMSg1YP/mfiNNS/3xZGRFQ32uP2wzPGtqM C0r3KkjjaBjkVJQEPtBPvEXgUbZV5rRjisF+wixaydHw3E2Pe0NwZGCtKnnt6n1msXCz Gu2VGVo+34aLLzFwIJVe4YoaImFoGVxDSXoM4qeRn+OzhMmEOCJ+uzEFN0v1ZykDCwSc tg3VVK5722Iko6MqPLzlTq5kCiDwJtad6gtwRJWnrJE6dTMjyfSrFuqBJTvOmZ7fM/0t d31EsGOWjWwSPLW1YSPudOtvnnHZeKVzMB5p8WEbSX9cZ0gCFAELdbrbuFuwNtdC3iT6 BXBA== X-Forwarded-Encrypted: i=1; AJvYcCXxuXXsEqvpDtiIImoh0vM53P4wd7lwcvq7goIhyG7PNbfxmB2rWnmjpZ5oDaG+c7ICAsX8hDClt5xtdtE=@vger.kernel.org X-Gm-Message-State: AOJu0Yxd399lPmC4YNcWfnU2GZqr9XzRiAilOe+kdj4vjE7GUdCLx5PQ j7BIDkaE+menHLKt+5yOx3GakxCVVMImA8F0eZwS7oSduBMjaTf48kHRSnvUtA== X-Gm-Gg: ASbGncsan27eN6v4kr+GIrDwC6QvDUjWJHHExhmUmmiHa+sbikLclZp6OiiCYMCC4xF +2SJW/+JeexfUc/yVK8yBFu/vNkb5x1mXhz6B2wxXNr+sN+vJa5l9abLCB+3+j1nnxRVDRnCneP 2wIvZTsWxi9idsQBvOT9g0/AyLjXap5e9UuaAjoe3xvhFJUsyOS3OBLmZIkTc+9JWK/JXahANB7 NikFCAOKc7Mp6YkrGUtnnHSv8QkZwATCHmbE/VVdv+ffMpc1UiyATk/yaRhQqeuLhZDJe4p0scg Uys/ZMwzhFbLuCkq+4lfcBbh X-Google-Smtp-Source: AGHT+IFDq/YyaSDjFBUXsfLRGsjk8UOE+Mft2rZWydxkoxjhSW9PDslAnWq3gxZr/nwtXjYBEcitrw== X-Received: by 2002:a05:6102:e0f:b0:4af:4c4d:c8e8 with SMTP id ada2fe7eead31-4afa4fb9017mr3596621137.7.1733260821288; Tue, 03 Dec 2024 13:20:21 -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-85b82a89d5csm2140364241.8.2024.12.03.13.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:20 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:09 +0000 Subject: [PATCH v6 2/5] 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: <20241203-uvc-fix-async-v6-2-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@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 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. Cc: stable@vger.kernel.org Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control = Change interrupt arrives") Reviewed-by: Laurent Pinchart Reviewed-by: Hans de Goede 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 9a80a7d8e73a..42b0a0cdc51c 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1640,10 +1640,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 From nobody Fri Dec 19 04:58:03 2025 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (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 8673920B1F5 for ; Tue, 3 Dec 2024 21:20:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260826; cv=none; b=mdBMoIPtqC4W82Uzl6PNr9/HS8G6mlwToF2CqKvAGif980W5LiWjjTqnv82irfphZO+1dEJFXdM3JksWwVZPgJuxTy3SubwxZYWuSoc05tXk34Ltzs0EBkNga0LXsZP9chIgBY5+BIJlQauxqVA+4r10bOWvz+b/satwSna/qvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260826; c=relaxed/simple; bh=C3v2J+2poN58Kyl3O5+kAnV8oVk30/d9asKCtbOCpXQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dxiQxm2wFyBZwATlDX+LwdQzaF1B6x0slPN3KA1rg/RnLJGn5YsXlKJPooduWrhZm24RhK/J66SBqULLUoq4iF+Y2l/qk/WzhIRjo6zbutr+h3z+h2ivRu7jPg0FeCop9svAMVvhW4/qOZkW2sc7phsg1UIK78hXtEukzPUB2II= 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=AR4aT02T; arc=none smtp.client-ip=209.85.167.178 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="AR4aT02T" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3ea4c550a3fso3027720b6e.2 for ; Tue, 03 Dec 2024 13:20:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260823; x=1733865623; 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=8ac3SDhZgwboifbpkv9WFxBdAVzUo9z6wiYYzPt9fB0=; b=AR4aT02TJkCl7TZbBkxYTst8fo2qkgQjde1s2ADTzzrdR6VZnOj8Y8kS2C2EJgYq0X 52Z4yryiwUacuZHQ2t6LsBHj0OilhfNTUCDOvCBM3ks8V5Q9SfPdV5LRrT6dof8MmPMj CnEc2OAFM20yjR+L/1kUb0V24yMi9I4uzZYIQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260823; x=1733865623; 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=8ac3SDhZgwboifbpkv9WFxBdAVzUo9z6wiYYzPt9fB0=; b=oKmmZRX+rOu8fCnwNwvO1aRA1odje5JWM2tVRcIflCefsUlIwsvHEO7OPjsQA55Mrq TSUZApJXDz9ER2fOiyVzjOwOX6DL2Cg2Bj6mkqfZtwMCpJ4BnjPGa0nSxIq4RUUUU25k Xrxctgw+XLkH4Fb5v2C4t0Fe9u/MMw6tQQfDerd3XCJXEDtnfclzVvfHUuZBpVLZlPRC OBIQLlH/XT4lRwlA5HEjn3HqOklCJ7ZHKyeniASEmgVZkJPX3vHjWNRuPGtRBTiXzXCq HnaSsdXa1fa9A6VlJaqQEfGxOqxbe73qSY1YAQw7Zb0DEpiFYlfotmVpAJPRxy9EuyKh vWPA== X-Forwarded-Encrypted: i=1; AJvYcCU79AdN6BtJ9Kx7sG/gtKP5T6p7hwXmb8lSJ9OQXdvOSnt5NLmZcOh8A0iI2lr15rPLExZRt9Bdbc9en4g=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5AdNI4EC2fp3joowPaNxBYSFnWAuVhpQTxHsvEd7wcLufwyws iVIi9QtjNEVJYG5WikvsBIezNSbOaueGQcTZf0MBHTI8MoaxpFf6GL2OfKW0Qg== X-Gm-Gg: ASbGncv1xPh8Y8ZPsfV3SkcKDxzbfuufCjW0m/iUxZ2rbMCp4H8xaGt7CRVoQ8tQDyW uYN6wryHujMuWKDkC7W658VWjnAuCOmQWlN3ObAnMeN6Ocb5jzlFmViQ7uhRkH1IsAgl/BuyqKh QWVoL0s1pYONtBCDUqw7LFwsG5EOwEp3vvllvhAAAL2wIrb2twFHMGym5wyQxNkFCDkWRV+1Z+f wRpV/zTgyFgaGY3eYRPn35WfzBbIPteXrN/B3jdL4m2nx71Q4VGxQ9gjLmfM5tID0s2aw1/JzCW jSE+D0AlbtOezpzCKpFJZu7b X-Google-Smtp-Source: AGHT+IHGHLmqOEE6bDN/rik+bHTtTVn/fqIntJnNo8WaDnRDY6V/anFIBM7Fu6XvZHT/7pziDCMZzQ== X-Received: by 2002:a05:6359:7903:b0:1ca:a437:3322 with SMTP id e5c5f4694b2df-1caeac0e68cmr447232455d.16.1733260823542; Tue, 03 Dec 2024 13:20:23 -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-85b82a89d5csm2140364241.8.2024.12.03.13.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:22 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:10 +0000 Subject: [PATCH v6 3/5] 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: <20241203-uvc-fix-async-v6-3-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@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") Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 58 ++++++++++++++++++++++++++++++++++++= ++-- drivers/media/usb/uvc/uvc_v4l2.c | 2 ++ drivers/media/usb/uvc/uvcvideo.h | 9 ++++++- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 42b0a0cdc51c..def502195528 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1579,6 +1579,40 @@ 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_fh *handle, struct uvc_control = *ctrl, + struct uvc_fh *new_handle) +{ + lockdep_assert_held(&handle->chain->ctrl_mutex); + + if (new_handle) { + if (ctrl->handle) + dev_warn_ratelimited(&handle->stream->dev->udev->dev, + "UVC non compliance: Setting an async control with a pending ope= ration."); + + if (new_handle =3D=3D ctrl->handle) + return; + + if (ctrl->handle) { + WARN_ON(!ctrl->handle->pending_async_ctrls); + if (ctrl->handle->pending_async_ctrls) + ctrl->handle->pending_async_ctrls--; + } + + ctrl->handle =3D new_handle; + handle->pending_async_ctrls++; + return; + } + + /* Cannot clear the handle for a control not owned by us.*/ + if (WARN_ON(ctrl->handle !=3D handle)) + return; + + 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 +1623,8 @@ 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; + if (handle) + uvc_ctrl_set_handle(handle, ctrl, NULL); =20 list_for_each_entry(mapping, &ctrl->info.mappings, list) { s32 value =3D __uvc_ctrl_get_value(mapping, data); @@ -1863,7 +1898,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, =20 if (!rollback && handle && ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) - ctrl->handle =3D handle; + uvc_ctrl_set_handle(handle, ctrl, handle); } =20 return 0; @@ -2772,6 +2807,25 @@ 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) { + if (entity->controls[i].handle !=3D handle) + continue; + uvc_ctrl_set_handle(handle, &entity->controls[i], 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 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 */ =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 */ @@ -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; }; =20 struct uvc_driver { @@ -797,6 +802,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 Fri Dec 19 04:58:03 2025 Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) (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 3ED2920B800 for ; Tue, 3 Dec 2024 21:20:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260830; cv=none; b=StaYHhZi+OpGGuSWfq/KaWAZHWVxZqYOQWQsP8lidinI2o2c0Y5zpSlulgInj5ntwIvbhHr6I3TuWOHmkXbm81JAcjwXnYJLdwv31FAmQmzWOft6oVIFWxReco4RZjz3A+zwHT1n8td8FOzPpN679bexEYrI31bAUrpn+Z9pSy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260830; c=relaxed/simple; bh=9X5eIMvV46W8qWA8ZhdVfchZUxJMWj63sIIb96EFcB0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B4o1QZT8QiOlyxCWDWIW6jTWZWdzluF2xICk1wphbOPB2bt1/KYp3vjlN5fzWII4FKJezjSIDnERNokTx+VOmWjkMjzy5nBHlJq1OcGGptxqXCNmMdwGvvDsPCYUkz0+8rYVRV3k7KabeZlLSFsY/kG8hQr4sBPG6TiIMeuZiTA= 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=EHUBukod; arc=none smtp.client-ip=209.85.217.42 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="EHUBukod" Received: by mail-vs1-f42.google.com with SMTP id ada2fe7eead31-4aef56c5cf9so1491604137.0 for ; Tue, 03 Dec 2024 13:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260828; x=1733865628; 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=1uy+WksCKY0gvDpLPtmZnEMUkklb+4A0f37uyRA+CFY=; b=EHUBukodyLCUlXFgla1ljTvMtqfT0HDw6Pqn1Ma+XA0lgBvEOPgeV+itcdpTDLE3YD ja81cqalQCJJmOYm17L6Z05FtLHpk+FdjQwv1XJqsGWRAqIQC3U4l4FdYXaGFjE0Ftgb dTETW7f1RH0f89JDYP/abGa66MrTx2UfDocoI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260828; x=1733865628; 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=1uy+WksCKY0gvDpLPtmZnEMUkklb+4A0f37uyRA+CFY=; b=Z4gXpvmJq2B5lw61OZKrDXb3pLLGsWdFSK/4Ho+MgNCs0q+DP/64wfV0uuDxy2WhqT rG4wed0uJDSyqgaX9X4sghbkVrRPOhZvobg8hE38h9CVB2BJWLw8FCBghk3J1QOxEVv2 xbnTEmO6ODa/enZoSaXP4z80SU4CY1EydEwU6aOGoeGzPc/KybOLWdcDi9033Tlp6kEs 8IL+NFhxyAOErT/LsBD31UQkNx4D1r9O6xtkWGpbRerZ4gErIMKZf94tQ336pdUIT6BQ LDdxIaQ/6HtjRob9h1ZprsIiY7GlifxJg+W8eW7TOjyxv5HrSSyLFIFGRpqhcejpsz2w Z/YA== X-Forwarded-Encrypted: i=1; AJvYcCV+G1sgkweFAshidjsC4URp0MpFelL7G43dWfc6LVHPTCx+6ag7dku7MkBWWCiEZCzbfxa89s7dJ0oiswA=@vger.kernel.org X-Gm-Message-State: AOJu0YwQ8zMOY+BTChTBJwRfKE9qnekI8VVU/ZFOQFu4cGiRSlBzAI5K R+/qDDzNB7otWpLrtPovAN9croPAPnOBWxxjif0/B9VXa32GTo6HQiMi83Ka/Q== X-Gm-Gg: ASbGncubzo/fOPGqpKCcvLcP1D1HHNFsNqWhsW8aauT4/gFSta+LegwJu5hhtbhjAxP GPPKNwH7YdWDHCQL00pMKjTYN8mmP1a2QiTCORPI6CyK6HYlObD0nIw7F3lXiKRsvaDxIt1CQgI SxoTMs8iVo/VG/5IHnnsg1nEjKNwFvrj2w+rFaFV8X7IZin0C2QC7L313aHC1Y20MuvQwclxv87 d4u7Gvy2BMXSHIhKVHMWYwyJCpd141OY94HE7voy+6fG+zG2VF3jTCu14JLgYKh5fw9da+K+ya0 c+JnVt5Nq8ZSYj8B+9i+LXgJ X-Google-Smtp-Source: AGHT+IHRabdBjEHecDYvRcDdxhxnXbNb23cpwrgd+owBsDEQqOzvydhJ6thhewZyJGu/Nbu+3cfgmg== X-Received: by 2002:a05:6102:9c4:b0:4af:5f6a:e73f with SMTP id ada2fe7eead31-4af973111b4mr5826942137.24.1733260826831; Tue, 03 Dec 2024 13:20:26 -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-85b82a89d5csm2140364241.8.2024.12.03.13.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:24 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:11 +0000 Subject: [PATCH v6 4/5] 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: <20241203-uvc-fix-async-v6-4-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@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 Reviewed-by: Hans de Goede 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 def502195528..3dc9b7a49f64 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1981,6 +1981,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 Fri Dec 19 04:58:03 2025 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 0C42F20B80B for ; Tue, 3 Dec 2024 21:20:29 +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=1733260831; cv=none; b=X5An4prvND62JS+qbwvdGLlSFjn02qNFnQWByxlG3MN7nbxGXRzW97oInF/EcYEdG+kg1WCf8GPJr4JcWxI1St2pS/aNtp667t9iM9EXyIN/7W7aKQRiVg8HZXtAvdx60BWf3Aok1GZSdtHKTo9VDwZd0ymazEQznm6IZbjk5lo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260831; c=relaxed/simple; bh=jFTBG9LprJIjbHQlM1I0RJN2j3CUZpzoB8yyx/zxbSw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fEjuKvMGwLXiiZhvrCJKoNa0jAfVmzNVaKzqFJgmyorEIdO6gIIMgASq3lAWEfKw7ssLfFLIyT7zAf9r0rrSRpzT+TCZwe6xpt1rgPWKZRoqeugqnOQFUAnFTVs2ciSPrypHMaH+w10bvMn2o634FGbKhJIuUS9udbZ2dg+SCwg= 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=LyCfcK68; 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="LyCfcK68" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5f1cec20a77so2095132eaf.1 for ; Tue, 03 Dec 2024 13:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260829; x=1733865629; 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=zLLkfyeupXOCJEsbtIiRnjf9v6qN6z82wPD/jzcKBAs=; b=LyCfcK68f5N6DK8XS3wwSUe+nlKahIqetZ+9qL/+vkDYLNgYksRTzeJvB2aNRsYtko 4dvZu9OcRJhgIUngglhimUfE2S6HpL2qRnQG3de59EpLklP/DcTyNcJpnkNRH2VPYDfz GrJiJreNnCvDuXZ9iuCo8GlHhGX1oQFHHxHK4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260829; x=1733865629; 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=zLLkfyeupXOCJEsbtIiRnjf9v6qN6z82wPD/jzcKBAs=; b=i7vCGSV7QGXDj44rUKkUuPUFFRKbJXB0B/jJm57d4mdx7CCKe9qWPBY5hznVk430qZ j5B7bJa7HQBtVNyKizyyBegw15TslIYnZ99RG9lK+h5SV985WpZl+PtOtDzS+QCNqA4X 63n8u8Nc4KYJGBLHy5vqd2JdDX1m8T7DJxD69Cs5xLXnD15dmB1sS1mreHdsZ/SUNKLk KuHz28toMDxb4aVUC+HGd76yoF5Q57VBxG2MJTksIlzjl4A9PI2b15nO+O3c8zRduMgK xzm+xCfTpsAlRUrcNhPIptQh/CZuPYbjJ2ujox1Ublf6a4/tP6wzfdr+DyoHQObtiYx9 vdXQ== X-Forwarded-Encrypted: i=1; AJvYcCUQ98xslOEhFqWFSxH2C7vLY+308CQg0i+Y30MTB9EdBrt12EEezwOLSxBEIwq/4JMPIIf0yk9FNfFOxuY=@vger.kernel.org X-Gm-Message-State: AOJu0YxAfB8EP/KWswT1jfwqfPAfQj4eC19AlS5ERZiMcG3jJvjVNcXH 7yBJ24aiPbdh/5DloPXALO91YBN4IAevVWlyuMkX7iUhNT9IZ5ZS1TeFfaEyaw== X-Gm-Gg: ASbGncvsNFG9y3/vCVMYalGuJiK5Kcp3zXep4S9OF0IF2WxiiwZTlHDfnYkiJfplzSS iSDxuDQMfA7CgUO4clduL1dY0JExVUlpyVTnTtf2zYXwz9Uon8+Y24ANCKnv/RbYrQDTxkG+Zvo /FV/YrGRLl+rxTAA8zDBUabt+fhBntrD3Vz57srh01tzIVkk96BYbXq8/8Sq7/aQS9pZ67/d0Z8 e8bAV+uv6Z1AcmpKwBgftnR65bSGDXNKJ4CxGnUlkS6BotxaUpX0/P9YxA0wto6pICaKNzls8bd ArWeswMRBmm8RnU+WEcrHh0p X-Google-Smtp-Source: AGHT+IHXPcyq+8B+KJ1dPXvdy3NU/VpWuqhFh2jcwyvKYbPbXmP0jy2dIclUy4Dce3/3CyVeNJ8Jdg== X-Received: by 2002:a05:6358:5bcc:b0:1ca:9660:67db with SMTP id e5c5f4694b2df-1caeabd17d0mr509285255d.23.1733260829162; Tue, 03 Dec 2024 13:20:29 -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-85b82a89d5csm2140364241.8.2024.12.03.13.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:27 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:12 +0000 Subject: [PATCH v6 5/5] media: uvcvideo: Flush the control cache when we get an event 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: <20241203-uvc-fix-async-v6-5-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@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 Reviewed-by: Laurent Pinchart --- 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_c= trl.c index 3dc9b7a49f64..db29e0e8bfd4 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1622,6 +1622,9 @@ void uvc_ctrl_status_event(struct uvc_video_chain *ch= ain, =20 mutex_lock(&chain->ctrl_mutex); =20 + /* Flush the control cache, the data might have changed. */ + ctrl->loaded =3D 0; + handle =3D ctrl->handle; if (handle) uvc_ctrl_set_handle(handle, ctrl, NULL); --=20 2.47.0.338.g60cca15819-goog