From nobody Tue Dec 16 17:45:13 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 5150838DE4 for ; Mon, 22 Jul 2024 07:59:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635188; cv=none; b=D0wvCe1YngL7ccXlebOiRLbv2JKf5+Eyk7p8IxsRkDZICaicCYnE3Fft7M73fJruQuzmaz/z7cgmSzAMPmebuPAn99j5ssPrYaYyUIi5beZoj3Hz2DPuyRXtJjgcQ/YhTraooiz+NOMdiezIRaJWq7nzQFd0l5wERkX/bY9aBDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635188; c=relaxed/simple; bh=ih0oOyBdDWMghtImdERLunCZVfcxNuenLxXbTArNr9o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Wdk8ucpUtnB1kK81wWu4nXbKgTK7WLFcQ8qX0pk4HQVnXOIjHPdWMxpO0HJcvEIw0IXzYsZ555EXBLZdsS3jIYTNUvpH4NP4oim1okF2xPcDeFZk7/RfJkHeuIxV62cIxqp7pWW+N9yktdnAcRWi1+u4KEhEU0t+XBcmYFCSfHw= 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=WT4JN75y; arc=none smtp.client-ip=209.85.222.180 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="WT4JN75y" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-79f19f19070so186421485a.0 for ; Mon, 22 Jul 2024 00:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1721635185; x=1722239985; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=4+zgXocDeC2RuEHsaW4tq9GG4rpo6JvrpIHNShAs6hA=; b=WT4JN75yJNieUWCjqmdo5T6SRH8BEj+Lt27RcaeiCNqs/8jcfNh7Ry8wW7kZMXbe6Q UhKyQNsaXo8amZbCN1RX5lYBsk8syotw9oszlzuh6HEW5r4eKrmBAZWgvX6Y9hCqQMLi o/uMgiPE+4jmqWE+5H6BX4GCDudW5lLtM7dUg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721635185; x=1722239985; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4+zgXocDeC2RuEHsaW4tq9GG4rpo6JvrpIHNShAs6hA=; b=cNTAWzJhLoxSlNiTtpDTRogdkHXYq0MTwoCjezVLrYHE9l8XOd1zfZKB6sIeUql/Na wX3CEZjKu2QgxBGYOsiRxra5lAieRn9DXggymUNiWyG61qL8tznccas7xEUE356w3ljM Bz3Rq61QAvUiSLA4thcBNd+tby/1SY6wa0KEcWF1yZMgE2M6UBdoh4YuhdcroQBT8S5P 5erFH4XKnaa4S/orEDxgHelFw3ILOxO3Xki0ieaOgzeOw6oNwnZ7WNri7/TBxgn+JBPI TuO143+QBM2NHZniDlWCZZjdBfBFiX0zRR2e2taSlRVx+KiWEA8CPIRKodc3mrDbl+uC Cjdw== X-Forwarded-Encrypted: i=1; AJvYcCU1lGvopBFtzMT5uIuuN6UMfW3bd7zcgqK7sQmZDeRpQG8bnt0NgM/ERlUr7zUJeoKkFzgqnctZ6U407XTFheGwxzwYdi6OP5btm0+R X-Gm-Message-State: AOJu0YxjtGVDTHAeKUBZs5aqsWg67z+gNQAUQr74c39IeDht+M8UwQ/W ExsBo1bJ2/1y8n7JH2e2eq7r7eKLJ3uCq/jzNJa0oe0KUiF/N2wvxkrshL++Eg== X-Google-Smtp-Source: AGHT+IFmamk8Ht9tQ8qCsjD81rce8+5TXekAtDPmDVtE5rgDLYsSbBl0QWQDRWjfadNnJU4XxeB8+g== X-Received: by 2002:a05:620a:d81:b0:79f:84f:80a8 with SMTP id af79cd13be357-7a1a6538261mr1020910685a.13.1721635185298; Mon, 22 Jul 2024 00:59:45 -0700 (PDT) Received: from denia.c.googlers.com (197.5.86.34.bc.googleusercontent.com. [34.86.5.197]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a19900d93fsm334134985a.65.2024.07.22.00.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 00:59:44 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 22 Jul 2024 07:59:43 +0000 Subject: [PATCH] media: uvcvideo: Fix custom control mapping probing 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: <20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org> X-B4-Tracking: v=1; b=H4sIAG8RnmYC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDcyMj3bTMCiDOKUkt0s1NLCjIzEvXNbQwMTdPSTazNDCxUAJqLChKBao CGxodW1sLAOQQVelkAAAA To: Laurent Pinchart , Mauro Carvalho Chehab , Sergey Senozhatsky Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, pmenzel@molgen.mpg.de, stable@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Custom control mapping introduced a bug, where the filter function was applied to every single control. Fix it so it is only applied to the matching controls. Reported-by: Paul Menzen Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae= 1ddc4@molgen.mpg.de/T/#t Cc: stable@vger.kernel.org Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart Tested-by: Paul Menzel --- Paul, could you check if this fixes your issue, thanks! --- drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 0136df5732ba..06fede57bf36 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chai= n *chain, for (i =3D 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping =3D &uvc_ctrl_mappings[i]; =20 + if (!(uvc_entity_match_guid(ctrl->entity, mapping->entity) && + ctrl->info.selector =3D=3D mapping->selector)) + continue; + /* Let the device provide a custom mapping. */ if (mapping->filter_mapping) { mapping =3D mapping->filter_mapping(chain, ctrl); @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain= *chain, continue; } =20 - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && - ctrl->info.selector =3D=3D mapping->selector) - __uvc_ctrl_add_mapping(chain, ctrl, mapping); + __uvc_ctrl_add_mapping(chain, ctrl, mapping); } } =20 --- base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2 change-id: 20240722-fix-filter-mapping-18477dc69048 Best regards, --=20 Ricardo Ribalda