From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.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 C0B0E39B940 for ; Mon, 16 Mar 2026 13:34:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773668094; cv=none; b=JU6/7y+xLLN+W4xLSntRj4qAYfNb4bmUS7KaF2ACLQFnT3sh5Xld5TrstjFiwnQnrjt3gXaO3PoyOjyXrxnudbzYuCPkshRSeD9iCzwWL3+wl4rVfIC7aBYcnm8U73Dvmhl13z/4G5SS/f0/AhHePmUlTMbUcAKZqrMLFioqZwc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773668094; c=relaxed/simple; bh=t4X4K5vFnBQTTs4ZuZurlfNMkVH5xrm/oy3JiEkG6OQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d6MrdVwmv69T8p1SUssK/61kd2aJDtSm5SOl4c8+q0h8oae4EZyfsQivX3K8pkBwbMg/A09q3iL9uV8jKbWq0N8bJSIcB82DW9/xOZT3QZracVPUXMDMsZAqCupgkCRsn4DkvoqCMtsIkRY2hW2twZWmW4IbLze5XaqFk7AIbAQ= 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=EpUjj/sJ; arc=none smtp.client-ip=209.85.167.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="EpUjj/sJ" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-59e4989dacdso5161205e87.1 for ; Mon, 16 Mar 2026 06:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773668090; x=1774272890; 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=yAs/NGIMe6yEYwcK3Dv3ybFWLR+6vTJh3GyoeoXUzuc=; b=EpUjj/sJz9Ow3LOwmEtGX5lNS4FnjDMDQKj+Sb0YKUg7N0DGxo11T7kyuKmoXiOssr fp+9Fjb/6I2fPxZlCuuG/Txo/W/iUaI4nKu1ROQ3o3d9g4tF5/a6tBaMwaQtfi/9coz9 /8VjzH4gXCWEfuEJAyfYxcnwOsEzxb5C08wns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773668090; x=1774272890; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yAs/NGIMe6yEYwcK3Dv3ybFWLR+6vTJh3GyoeoXUzuc=; b=nEtap9XBBPbW51x6b/IyMFFrWHeMt9FdaAy7B7Wy9JukmjSVZh/UeCyBZq7XsURAHF 6imF99MeqXYqlgR7grYv23OVZOgHc86o5g58ZpOZPXLmR8jfPKruza3mcRpaSFu347ao ivQG67FuV/VePCaB7F8d20qj1Gve+PiO1YOizvFTzmar3CsTvPBB2baxtspC/etpIPKu T2vJ32xjtXBTO178IhNm0tegHSAatOCId/KJgou0OXGcr4OU4J5lIjstlwZjYdjbCAQ0 tNjn0pwnvtRibAojepIDAk5pP9kPMHOkOHB99yq400qLZiHsTcU1h42hVKYCgeDvpTj9 oYgg== X-Forwarded-Encrypted: i=1; AJvYcCWFHKk89OuEiUC3xKr6NejzDN3jftS6/tao7SBO7BiSMX0tJ34CW38vINkRX4Y63iiOE+A5bagzv8A=@vger.kernel.org X-Gm-Message-State: AOJu0YwmDeCQofwZOYTdh6+itwX91QG6SpfnC9S7i3h1dNicYdJZTVr0 uQkttmYSGvPvLwTOx4pT2sDr4/ixQewDPDaPzq2HPAYL5NvKNew6evQu/dIAhwBd1ph5sCwKg4u lMU1cfJM2 X-Gm-Gg: ATEYQzzDoM8anhK7aiBAdMboJ26QSm56W9/WFKrRBsZejQ7tXTj8ijTP9vw8GNTJZVD 4hlW9aQSvJITLfYFVHmk3v3x2GsF1PY4ImzMN+fKWRTy5Eccbj6n8EgSs/JB+9x4zGld+WNz7Bd NV27TNAWRkQpdvaaL4roV7JDvlFa2QTyIMNAr/ILq2MeUJId+2QflFNLx9dobB7Yp+0nhXLArr8 +riXyCste+37O/97ppyTZf5uhS9uw4++Ix+HiTK7MMEG9Ej93B+sELNlALcyPvRLb0Sxl5bljxy 1u9nijv+HatloHOQl/NpO2zym9XISnJwjMh2BwZFCj9+5pjWMuEjPj465TRh6GH4Pc0r2rLl1BK 0wXYMhFXTHjfzvW3pR+vFKK9un5TxIx1M2tiTHwCB/dfJpqRoG05+3F6aSEMdGgQPuG86RYSJqF 07/fK9x68Uv/41e7r23KHX3Df9CaXXhpTqqHamiEx64r4+9xdYRUM78LO47Fyz8whwTobefz/wm Q== X-Received: by 2002:a05:6512:10d1:b0:5a1:3e69:b186 with SMTP id 2adb3069b0e04-5a1629f4182mr4265107e87.19.1773668089954; Mon, 16 Mar 2026 06:34:49 -0700 (PDT) Received: from ribalda.c.googlers.com (27.69.88.34.bc.googleusercontent.com. [34.88.69.27]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a156366a7fsm3481473e87.76.2026.03.16.06.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 06:34:49 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Mar 2026 13:34:47 +0000 Subject: [PATCH v3 4/4] media: uvcvideo: RFC: Convert allow_privacy_override into Kconfig Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260316-uvcdynctrl-v3-4-19cd4657e1f3@chromium.org> References: <20260316-uvcdynctrl-v3-0-19cd4657e1f3@chromium.org> In-Reply-To: <20260316-uvcdynctrl-v3-0-19cd4657e1f3@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.3 This patch is just shared for discussion purposes! Do not land. In a perfect world, after a deprecation process, we will be able to remove allow_privacy_override and block all privacy related controls. If there is any usecase out in the field that resists, we shall move it into a Kconfig. This patch shows how the transition to Kconfig can look. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/Kconfig | 11 +++++++++++ drivers/media/usb/uvc/uvc_ctrl.c | 4 ++-- drivers/media/usb/uvc/uvc_driver.c | 20 -------------------- drivers/media/usb/uvc/uvc_v4l2.c | 4 ++-- drivers/media/usb/uvc/uvcvideo.h | 1 - 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig index 579532272fd6..7c0f2260d135 100644 --- a/drivers/media/usb/uvc/Kconfig +++ b/drivers/media/usb/uvc/Kconfig @@ -20,3 +20,14 @@ config USB_VIDEO_CLASS_INPUT_EVDEV to report button events. If you are in doubt, say Y. + +config USB_VIDEO_CLASS_ALLOW_PRIVACY_OVERRIDE + bool "Allow overriding the privacy controls" + default n + depends on USB_VIDEO_CLASS && BROKEN + help + If this option is enabled, the privacy related controls, such as + the ones controlling the privacy LED will be accessible from + userspace. + + If you are in doubt, say N. diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 3ca108b83f1d..c9c195974765 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -3075,9 +3075,9 @@ int uvc_xu_ctrl_query(struct uvc_video_chain *chain, } if (uvc_ctrl_is_privacy_control(entity->guid, xqry->selector) && - !uvc_allow_privacy_override_param) { + !IS_ENABLED(CONFIG_USB_VIDEO_CLASS_ALLOW_PRIVACY_OVERRIDE)) { dev_warn_once(&chain->dev->intf->dev, - "Privacy related controls can only be accessed if module parameter allow_privacy_override is true\n"); + "Privacy related controls can only be accessed if CONFIG_USB_VIDEO_CLASS_ALLOW_PRIVACY_OVERRIDE is true\n"); uvc_dbg(chain->dev, CONTROL, "Blocking access to privacy related Control %pUl/%u\n", entity->guid, xqry->selector); return -EACCES; diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 74c9dea29d36..b0ca81d924b6 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -36,7 +36,6 @@ unsigned int uvc_no_drop_param = 1; static unsigned int uvc_quirks_param = -1; unsigned int uvc_dbg_param; unsigned int uvc_timeout_param = UVC_CTRL_STREAMING_TIMEOUT; -bool uvc_allow_privacy_override_param; static struct usb_driver uvc_driver; @@ -2506,25 +2505,6 @@ MODULE_PARM_DESC(trace, "Trace level bitmask"); module_param_named(timeout, uvc_timeout_param, uint, 0644); MODULE_PARM_DESC(timeout, "Streaming control requests timeout"); -static int param_set_privacy(const char *val, const struct kernel_param *kp) -{ - pr_warn_once("uvcvideo: " DEPRECATED - "allow_privacy_override parameter will be eventually removed.\n"); - return param_set_bool(val, kp); -} - -static const struct kernel_param_ops param_ops_privacy = { - .set = param_set_privacy, - .get = param_get_bool, -}; - -param_check_bool(allow_privacy_override, &uvc_allow_privacy_override_param); -module_param_cb(allow_privacy_override, ¶m_ops_privacy, - &uvc_allow_privacy_override_param, 0644); -__MODULE_PARM_TYPE(allow_privacy_override, "bool"); -MODULE_PARM_DESC(allow_privacy_override, - "Allow access to privacy related controls"); - /* ------------------------------------------------------------------------ * Driver initialization and cleanup */ diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 6d4f027c8402..f83abbd13aca 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -134,9 +134,9 @@ static int uvc_ioctl_xu_ctrl_map(struct uvc_video_chain *chain, } if (uvc_ctrl_is_privacy_control(xmap->entity, xmap->selector) && - !uvc_allow_privacy_override_param) { + !IS_ENABLED(CONFIG_USB_VIDEO_CLASS_ALLOW_PRIVACY_OVERRIDE)) { dev_warn_once(&chain->dev->intf->dev, - "Privacy related controls can only be mapped if module parameter allow_privacy_override is true\n"); + "Privacy related controls can only be mapped if CONFIG_USB_VIDEO_CLASS_ALLOW_PRIVACY_OVERRIDE is true\n"); return -EACCES; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 362110d58ca3..2898384d5f78 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -664,7 +664,6 @@ extern unsigned int uvc_no_drop_param; extern unsigned int uvc_dbg_param; extern unsigned int uvc_timeout_param; extern unsigned int uvc_hw_timestamps_param; -extern bool uvc_allow_privacy_override_param; #define uvc_dbg(_dev, flag, fmt, ...) \ do { \ -- 2.53.0.851.ga537e3e6e9-goog