[PATCH v2 1/2] usb: core: Amend initial authorized_default value

[PATCH v2 1/2] usb: core: Amend initial authorized_default value

[niko.mauno]

From: Niko Mauno <niko.mauno@vaisala.com>

Since the wireless USB implementation has been removed and since the
behavior with authorized_default values -1 and 1 is now effectively
same, change the initial value to latter in order to stop using the
leftover value. The former value can still be passed as a module
parameter to retain backwards compatibility.

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
 drivers/usb/core/hcd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 12b6dfeaf658..9aa5e6bf9b9d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -357,12 +357,10 @@ static const u8 ss_rh_config_descriptor[] = {
 #define USB_AUTHORIZE_ALL	1
 #define USB_AUTHORIZE_INTERNAL	2
 
-static int authorized_default = USB_AUTHORIZE_WIRED;
+static int authorized_default = USB_AUTHORIZE_ALL;
 module_param(authorized_default, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(authorized_default,
-		"Default USB device authorization: 0 is not authorized, 1 is "
-		"authorized, 2 is authorized for internal devices, -1 is "
-		"authorized (default, same as 1)");
+		"Default USB device authorization: 0 is not authorized, 1 is authorized (default), 2 is authorized for internal devices, -1 is authorized (same as 1)");
 /*-------------------------------------------------------------------------*/
 
 /**
-- 
2.39.2

[PATCH v2 2/2] usb: core: Make default authorization mode configurable

[niko.mauno]

From: Niko Mauno <niko.mauno@vaisala.com>

Make the default USB device authorization mode configurable at build
time. This is useful for systems that require a mode that is stricter
than the standard setting, as it avoids relying on the kernel command
line being properly set.

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
 drivers/usb/core/Kconfig | 17 +++++++++++++++++
 drivers/usb/core/hcd.c   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 351ede4b5de2..f337aaea7604 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -116,3 +116,20 @@ config USB_AUTOSUSPEND_DELAY
 	  The default value Linux has always had is 2 seconds.  Change
 	  this value if you want a different delay and cannot modify
 	  the command line or module parameter.
+
+config USB_DEFAULT_AUTHORIZATION_MODE
+	int "Default authorization mode for USB devices"
+	range 0 2
+	default 1
+	depends on USB
+	help
+	  Select the default USB device authorization mode. Can be overridden
+	  with usbcore.authorized_default command line or module parameter.
+
+	  The available values have the following meanings:
+		0 is unauthorized for all devices
+		1 is authorized for all devices (default)
+		2 is authorized for internal devices
+
+	  If the default value is too permissive but you are unsure which mode
+	  to use, say 2.
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 9aa5e6bf9b9d..d56597dc7d42 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -357,7 +357,7 @@ static const u8 ss_rh_config_descriptor[] = {
 #define USB_AUTHORIZE_ALL	1
 #define USB_AUTHORIZE_INTERNAL	2
 
-static int authorized_default = USB_AUTHORIZE_ALL;
+static int authorized_default = CONFIG_USB_DEFAULT_AUTHORIZATION_MODE;
 module_param(authorized_default, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(authorized_default,
 		"Default USB device authorization: 0 is not authorized, 1 is authorized (default), 2 is authorized for internal devices, -1 is authorized (same as 1)");
-- 
2.39.2

Re: [PATCH v2 2/2] usb: core: Make default authorization mode configurable

[Geert Uytterhoeven]

Hi Niko,

On Fri, Jan 5, 2024 at 12:51 PM <niko.mauno@vaisala.com> wrote:
> From: Niko Mauno <niko.mauno@vaisala.com>
>
> Make the default USB device authorization mode configurable at build
> time. This is useful for systems that require a mode that is stricter
> than the standard setting, as it avoids relying on the kernel command
> line being properly set.
>
> Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>

Thanks for your patch, which is now commit bec7e43b162c5879
("usb: core: Make default authorization mode configurable")
in usb/usb-next.

> --- a/drivers/usb/core/Kconfig
> +++ b/drivers/usb/core/Kconfig
> @@ -116,3 +116,20 @@ config USB_AUTOSUSPEND_DELAY
>           The default value Linux has always had is 2 seconds.  Change
>           this value if you want a different delay and cannot modify
>           the command line or module parameter.
> +
> +config USB_DEFAULT_AUTHORIZATION_MODE
> +       int "Default authorization mode for USB devices"
> +       range 0 2
> +       default 1
> +       depends on USB
> +       help
> +         Select the default USB device authorization mode. Can be overridden
> +         with usbcore.authorized_default command line or module parameter.
> +
> +         The available values have the following meanings:
> +               0 is unauthorized for all devices
> +               1 is authorized for all devices (default)
> +               2 is authorized for internal devices
> +
> +         If the default value is too permissive but you are unsure which mode
> +         to use, say 2.

I'm sorry, but I don't have any clue about what to answer to this question.
Usually, you are (or are not) authorized to do _something_, but the
/something/ is not mentioned at all here.
Can you please make this a bit more clear?
Thanks!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 2/2] usb: core: Make default authorization mode configurable

[Niko Mauno]

On 6.2.2024 16.33, Geert Uytterhoeven wrote:
> On Fri, Jan 5, 2024 at 12:51 PM <niko.mauno@vaisala.com> wrote:
...
>> +         The available values have the following meanings:
>> +               0 is unauthorized for all devices
>> +               1 is authorized for all devices (default)
>> +               2 is authorized for internal devices
>> +
>> +         If the default value is too permissive but you are unsure which mode
>> +         to use, say 2.
> 
> I'm sorry, but I don't have any clue about what to answer to this question.
> Usually, you are (or are not) authorized to do _something_, but the
> /something/ is not mentioned at all here.
> Can you please make this a bit more clear?
> Thanks!

Thanks, submitted v3 which is hopefully better in this respect.
-Niko