Received-SPF: pass (google.com: domain of linux-kernel+bounces-17817-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: niko.mauno@vaisala.com
To: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	vesa.jaaskelainen@vaisala.com,
	Niko Mauno <niko.mauno@vaisala.com>
Subject: [PATCH v2 2/2] usb: core: Make default authorization mode configurable
Date: Fri,  5 Jan 2024 13:49:56 +0200
Message-Id: <20240105114956.30714-2-niko.mauno@vaisala.com>
In-Reply-To: <20240105114956.30714-1-niko.mauno@vaisala.com>
References: <20240105114956.30714-1-niko.mauno@vaisala.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?CieqGXmA1jjp9wWlmAjkNXooUpjRzujLfVJcW25aX/q6YSLw+lM+/4sCfZh1?=
 =?us-ascii?Q?xARrayAglgbZzdh5ZVpLrWdYCyXI5MUxZ23pnCv0e6rzmgo/ciHlum8Gyyx0?=
 =?us-ascii?Q?ySX88rzZwh80sukIV9qA6wFwc5cZr8NKIRtXxM5+76Y09sXEdB/wIZKque4e?=
 =?us-ascii?Q?FOsXilGQkDd3DXGVrQ5Az2gdazobNtm767iPK4OGPkBqaPGo/qWPvxrMrcYY?=
 =?us-ascii?Q?GGvShkaj9ASGYoxc7QKmB5yhUmeR8SSolNX81Q4wg51M0tEBf4z7H0gDT6Vm?=
 =?us-ascii?Q?tVEzfAzKMUT1uCQdXrKMfyn4uKwnaLxtq3PjCsH9uxd6KTbSB+5l3yXkmQhl?=
 =?us-ascii?Q?CFMkKpULIfeLGU65JTLekSjXkB8ctzhn6UEg9TcPfbtf/YNPyswK7UJZcuN3?=
 =?us-ascii?Q?w0vBv6E72NOLePwUcwSCMbX1HvVHe6FrpO6KK3rXgztpvthtyjcoV9AT1IYw?=
 =?us-ascii?Q?hCF11oimpBjVetKgsTfYKhyOoOeDsHSj46epARMrfAeBdiUeGp5rImmX6LOI?=
 =?us-ascii?Q?WNc0TaT0n4x1AYTL5NPj4hcd3O1Y44tVDhSlzlI4t9HvT9Wvjv3KAgk3HQMV?=
 =?us-ascii?Q?fwqwUEGi5IZTlOYMRdXXDgnjDgaHrhJ0PHR8ftQQmpFBjfeJe4x8/oG03vrT?=
 =?us-ascii?Q?joexogN7VozSRHxNQLdLAU2HVB7KrcWpxfGzpEOo4uqFzJBTu7taBTmxxqbq?=
 =?us-ascii?Q?8cB3OS1T8O+0RQ0p1DS8MWyfgG+9k/HEtpRnEwJ8UItTZUpSP0VIYlUUZNc7?=
 =?us-ascii?Q?itXYpY3z1wyC/rJzbG7wVyjwCHBrw6sqKR8NPvTUlwuXCr/Lyr7Fx28rWau1?=
 =?us-ascii?Q?7wLID4sKAK3/Pazl+YKtGCiYS1L3gHENwNI7G0amz1sDNfFtzkejy+y4aWQ/?=
 =?us-ascii?Q?jlYg81xzCO6wJomXsG2eDaDTe4qBeUbvYyp59ZvgcTPEaZGo0nK6CK4cstYt?=
 =?us-ascii?Q?beS5RI3yKoBajy2OnPaWHY+FhzpDUUz8wRZX8EMFPOTTG1nQhOEXFrYUjLeH?=
 =?us-ascii?Q?WxF2X3oyzVq+Rfw1dt616/jVxm7Htba0nl/FrcW15teiq4NjAh8ChX0Ogo7r?=
 =?us-ascii?Q?mC38shsu/W5ovJ3VA97bX/a5vw3j5WvJJ5VuQNsIRz4C/97doDQQ+NKJqmzz?=
 =?us-ascii?Q?16fiZLvIs3yeQ/mWAA5mguW+Vr7Tq43hcZCsWt9NCDgtn267ycWbZFLNjCNV?=
 =?us-ascii?Q?UUKvNs1S4FPPtUiuFIeolOZKDmQAq1gxhKcWZ8qKlUdGlGiVMRIJGu2/7nbH?=
 =?us-ascii?Q?egCCKj8At0AqRm0B4ctHNDHMj1wzdWD/a3wbhGYd5s8WRuzigoH8LYkn60IE?=
 =?us-ascii?Q?c1/vQFQDgcnjZvoDwqKrY9zQRhHN05l6VkggayKUELnTb+9VI1w1pFQSTpJl?=
 =?us-ascii?Q?hZQQa4LTZso1OiZofiSwXU3gH1fRYQB5lKFC6bAmor28B4zGF1UxPoqFTQHJ?=
 =?us-ascii?Q?srpgn0wiozCMZryUVY/wMyoE7hssvplSwJsTRTRwxgmBWOEuWjnTT/87cAWj?=
 =?us-ascii?Q?fdE/kfFbICfEcnL38eVeGD24KpMtPMT/yGZwp9FMuBKeZiWA6t7S4E1X4+lL?=
 =?us-ascii?Q?P6z/LFOjV1k9yXWeeBvSAyfUV1Km2lc1uFr+7APri+um1jWWnQkgrK83EUuu?=
 =?us-ascii?Q?+g=3D=3D?=
X-OriginatorOrg: vaisala.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7e797143-9dfb-4dab-b478-08dc0de489a8
X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 11:50:39.3942
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YQvJtENzXDV75sK0ksoy4Dg82duuVwr4PdDQQjuK5ojQwcFkiAbzGA0IJWl52UK5Iri5fSAd0Mr9RX7Dp/rYCw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR06MB6490

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