From nobody Tue Feb 10 04:58:36 2026 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