From patchwork Mon Jul 22 07:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 814707 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 5511915FD01 for ; Mon, 22 Jul 2024 07:59:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635187; cv=none; b=f9rgqZGnM5rt1nTJ/coAYJx1FDA1d7blyMDy2bXJFd4jsHSpVr0Yg+22lWSGGN/euBU9qktj2S6JItnEJxUUWfEpr4O38g3dX1YuHnVq4b8a+EKqs/WEP4SmQzgpnRrTzp+aUA7Z+6XTCQi9BE1eCbVBF4jV6Lc5EY855I7zTQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635187; c=relaxed/simple; bh=ih0oOyBdDWMghtImdERLunCZVfcxNuenLxXbTArNr9o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=dRxEJR9HySvLa8jV14dqeyg6yyoS4D+yKJdxhIen7SbXD5Pj9nb0caXUuXePwI8cBOGp6UoAo++Rmd+YZROJ2dNrLPF5b8wOkO3fgvzGF5XM9SACG77SBPuENRc7EMD58r4AyCbOBOJXpUJqj0vBs+6s+oKiK/duYokoWQIWKvE= 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.176 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-f176.google.com with SMTP id af79cd13be357-79f18509e76so230033385a.1 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=VoDs6B4YA7NnPc16ihOLm5zhRapE9XgDxZKibQCzJsVd7DaOZv/XrJu1BNu4c5x1co 7NvWKUcvon2MZq6ZN6R3jwqP5oJJ5RGK5o5N4v/JhoRcEBDM1ECvsucE4vGkP7dILlun LlNNETSL84DXphMZor9Lm5F+QDqyO+OI/it0z1gef3PhEtWN/dWhEqRApLVpaBNVJCfU wB16y/cBvv9QVtFVR4SXmzXk+FRe/q5NgFYMhCDxVTM5uXKDWtsTt2+fxAvsSCdZucH4 DhUH004tpzmE6JgRIPcnzLO+7noVq2cSLd8HrjFgp1stUW7JN4y6Qhi33jk0VD9dQMxC m1Bw== X-Gm-Message-State: AOJu0YwkYalyeU1xCvegxpyTq0+th1scF5SQ9wT7XN+z51zAjB7pfaw2 74FkGnaDdbANUrmwcGJhHIUmQlNkYR9mJ/kHg1+EeWmCw/DGiUqtEJlKj7GEkg== 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-97d4dae1ddc4@molgen.mpg.de/T/#t Cc: stable@vger.kernel.org Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping") Signed-off-by: Ricardo Ribalda --- 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(-) --- base-commit: 68a72104cbcf38ad16500216e213fa4eb21c4be2 change-id: 20240722-fix-filter-mapping-18477dc69048 Best regards, diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.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_chain *chain, for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; + if (!(uvc_entity_match_guid(ctrl->entity, mapping->entity) && + ctrl->info.selector == mapping->selector)) + continue; + /* Let the device provide a custom mapping. */ if (mapping->filter_mapping) { mapping = mapping->filter_mapping(chain, ctrl); @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, continue; } - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && - ctrl->info.selector == mapping->selector) - __uvc_ctrl_add_mapping(chain, ctrl, mapping); + __uvc_ctrl_add_mapping(chain, ctrl, mapping); } }