From nobody Tue Dec 2 02:29:07 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.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 6E866327BE4 for ; Wed, 19 Nov 2025 19:37:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763581045; cv=none; b=L5BzR6mcT9fdvk5tDgyLvqvS/XEQr1KOFayPbbYYv2q9cMKBcgQpM/HhZHBvcTT493QHaEohGucZ/y2ln1csH/qoTP42O892Z/1X6SESrzrVRuDjF3rXPuun7fmJ1uATGuxwNwl6Hpj7BZrNTIXN09IilqNzB1J4P1mHqhVzo/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763581045; c=relaxed/simple; bh=XDj9ocTyx9oryYDrbjArgB3LC+yDZJXak7E+MwK0LjY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MSezXhxF1skaiF0OqSr6ilRZEQUkIGT9zZYBQr6e2oJg+rH1SZJTSNqY3nKT/mhY8pmO8ga1czs43cpL87RrF1jEV6fEy8LqmsuRedvhETq9DsGA6mupvAIRgKl0RaHvOLJaUQHy8W7/ZBhJPjVzv657ZyNUo5iO/SbWD2YtR2g= 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=YJGq39dQ; arc=none smtp.client-ip=209.85.167.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="YJGq39dQ" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5957ac0efc2so31006e87.1 for ; Wed, 19 Nov 2025 11:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1763581037; x=1764185837; 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=i5eTj0Zl9H6KKr2E/V9bLoQx3up36sHhHmEcBFbvIkE=; b=YJGq39dQv06n1uhvZK0GT7nUQuX1cyNATq3oqw436i21CDPryjgXqYcfaOw5GJ6SFO 3KmQw2xPYGFrxajojSEebU64Qwv0OCptr/GKKj+js8UzPA2z5H47zRFYOCzWrEyw4GQ+ 12s/H8z8eaE85+urKEB6c0VDiyPZel2FBIawA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763581037; x=1764185837; 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=i5eTj0Zl9H6KKr2E/V9bLoQx3up36sHhHmEcBFbvIkE=; b=S+wYQy7vX2Qj0p+9ylF85khi9TQ//K2ut+kVqrwyU8qEQfqSLGnZ8NU9l6rYVuM7kx 9r5z/x3ppVVSjWxP3xP7pWz+F+PihRPJ1EZ8f8vjYlfhHTsmgpODtbo6o4NQxcFHqLDB TpSvV6Zjba45GJxNcZpaws9UvOt7z3dFtDhi17MIIRnFw6eYRJt1A/aBborZMRpUUpGe qMWTUmi69s1YK3LvBwIYFysQmDcgQ3DbR2D9tUfZ0u11KTOIcS5FffL4mqkCAVmmIHSj b4FtsgBCHwV/qeg3jsNEbKeo2Dt9vZQpRWKO++zNLaoY4ZOzNLemODyLigJWgOJVds10 +pjQ== X-Forwarded-Encrypted: i=1; AJvYcCUz3pG6lrHI/7nAOW1hwfM/AZrdBAFw0kSW8PlPShmoiid225dPG38SZc+SI/A98hbJrUwY3YzzQs98CKo=@vger.kernel.org X-Gm-Message-State: AOJu0YyEjJrwStm2FNwV89i1dat/iRzIRrhzOGkL9qHbo9oYD2F7pIv4 J+PVnSEpGofysZC6b5gVnbZy+SyiezlkIA0An5g4gmvfNDKA0DoVEUht3WMOqIecdQ== X-Gm-Gg: ASbGncsp8szSTaIht7Ppgizivj4chwCXa1ACsvml36oc+lgtkvfsfvGm1x6+c6Aedon bPnSflVmqNHCshqSHxlZsmvdqKyREK7qeSRfOP3c4NweaLOCN3QL40n6FZlM0hmTScnukux8jkO 8RpWtJvlO3flzYZoEZEE7JJPw9i0Hi/5wuw2aaNT4Wgq7hq070u8dHQ4bqrgTPuidlvppXF4799 bkD+yHeBWCbqOeTRCoNTTGn9y4N27Z/7Lon2dhBmHhF42Dvv4aghfna8ZVNg9qcuQ+6kuuWqhT1 ZoRajamNy6I+Z1mJH/y3sRAFGjGdaLh8RaBUSxvXSF5efhhPiG47wAEsxqDg6oPiA6A9O7cx6Ya BEv0SHP/dxXUplNeP+YFMwT4BusOSlgRF81noNayYNUFQqFu922xBOCUFjZ/4ePDD+9Pip9P7O/ ZvGn0BDp79jaadD3cB40N6djJVe4hqes0H6s27vl7cl1dwrb6fTl/pWGvJRnbfTT2dpP37RzFkq zcSU06+iZE= X-Google-Smtp-Source: AGHT+IERHHkbtKXSw+15NY4svW/rWIoMgO85bCSSYZTk1S6xodaPy31Swm4Ot1JpvrPQxRHT3dqImQ== X-Received: by 2002:a05:6512:3d91:b0:594:25c9:2c6e with SMTP id 2adb3069b0e04-5969e2f6338mr25386e87.25.1763581037401; Wed, 19 Nov 2025 11:37:17 -0800 (PST) Received: from ribalda.c.googlers.com (80.38.88.34.bc.googleusercontent.com. [34.88.38.80]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5969dbd15a1sm65790e87.98.2025.11.19.11.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Nov 2025 11:37:16 -0800 (PST) From: Ricardo Ribalda Date: Wed, 19 Nov 2025 19:37:15 +0000 Subject: [PATCH v2 6/6] media: uvcvideo: RFC: Convert allow_privacy_override into Kconfig 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: <20251119-uvcdynctrl-v2-6-0359ffb98c9e@chromium.org> References: <20251119-uvcdynctrl-v2-0-0359ffb98c9e@chromium.org> In-Reply-To: <20251119-uvcdynctrl-v2-0-0359ffb98c9e@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.2 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 579532272fd6d7a8ef65c1a3a892b723f40e584e..7c0f2260d1357cc4f27fa63d90c= 42f61afd92da9 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. =20 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_c= trl.c index d9cbb942f798dc7138608982a5d3e3ef9f8141f6..c41724a342e57f64f3c10af9752= bd45209f80e36 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -3025,9 +3025,9 @@ int uvc_xu_ctrl_query(struct uvc_video_chain *chain, } =20 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 param allow_pri= vacy_override is true\n"); + "Privacy related controls can only be accessed if CONFIG_USB_VIDE= O_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 c292bf8b6f57e9fdacee726285f5b46e638fd317..71563d8f4bcf581694ccd4b665f= f52b629caa0b6 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -35,7 +35,6 @@ unsigned int uvc_hw_timestamps_param; static unsigned int uvc_quirks_param =3D -1; unsigned int uvc_dbg_param; unsigned int uvc_timeout_param =3D UVC_CTRL_STREAMING_TIMEOUT; -bool uvc_allow_privacy_override_param; =20 static struct usb_driver uvc_driver; =20 @@ -2475,25 +2474,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"); =20 -static int param_set_privacy(const char *val, const struct kernel_param *k= p) -{ - 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 =3D { - .set =3D param_set_privacy, - .get =3D 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_v= 4l2.c index 510cf47c86a62ba7fe3c7fa51be82c996cf37f9f..d52497d68b910553f385b1b41ec= 5c4eecb915743 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, } =20 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 param allow_priva= cy_override is true\n"); + "Privacy related controls can only be mapped if CONFIG_USB_VIDEO_= CLASS_ALLOW_PRIVACY_OVERRIDE is true\n"); return -EACCES; } =20 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 4b1a70e3100bbf2180411a865a89952a81d0f0a4..5da219e1c6ac89e89a1658f1126= bfa292876d55f 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -662,7 +662,6 @@ extern unsigned int uvc_clock_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; =20 #define uvc_dbg(_dev, flag, fmt, ...) \ do { \ --=20 2.52.0.rc1.455.g30608eb744-goog