Received-SPF: pass (google.com: domain of linux-kernel+bounces-16938-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: niko.mauno@vaisala.com
To: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Niko Mauno <niko.mauno@vaisala.com>
Subject: [PATCH] usb: core: Make default authorization mode configurable
Date: Thu,  4 Jan 2024 18:32:03 +0200
Message-Id: <20240104163203.7381-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?tpvbz/P4Jl7EGdbKQN+ItCu7grkvjYmb4wY6c62OXJl0oSBcJfjmwlFNFD69?=
 =?us-ascii?Q?bnJxnCh6tgIfkO8GnmMEDLqlvob6M66czjwpwZSudNcOpo0QtExwsX5Iv1zm?=
 =?us-ascii?Q?99RDVE0NubVsqWrRwcPUB/1CBojpGCKE1x61t4DVZ8GSdu5/kvElQXT4PxTA?=
 =?us-ascii?Q?mJtWraIjc2qHMXrrT7+0bnW2vo7idq6HdhRaVQ6iZMOXDgARE6CzvwsbcKMJ?=
 =?us-ascii?Q?VYM6Y+lC+37ybnwYs8mIGqdW1jb2CyxIKPw+eQNsLrUwCxjVff6iOdgocXEC?=
 =?us-ascii?Q?bHkyYqk29wWTWeTBKZH85DGkqQIvfih3IMEqvWHbkCSlHCXnse/lEGqYI3E7?=
 =?us-ascii?Q?isj7FHeOVzUCimILGnDlVIFlH9UIsA8VwrdeQNgP6iOU/NBQqPdtl17Z2cVj?=
 =?us-ascii?Q?btbbO/Xjp7nTjLr2rr+wHDX51iONC8xusCuKC1NbEhChp8DdgaHEe1I2UqMX?=
 =?us-ascii?Q?OamT4ivuc+iOrS9BoXHGWau+8NXqImZX/K9jfu9J1G7mkKcOftJW+FKTIRFw?=
 =?us-ascii?Q?QUK3LGJp0HR1QDmBlArqEcBkCEKtY3Cc2vDW3dtHbN9F5ekmHMGBk9NYqsjx?=
 =?us-ascii?Q?FeP5pSi2NyJBPrDQNMIQfQbecDdyppkbxOVA3AIvbPYmVq7KfK2lRUp51VU/?=
 =?us-ascii?Q?lfjQ0Qd6IdVasikVm5kanMm3XC72YjdY/ImTwSUAGsmzBEceHxi40SoxK5PQ?=
 =?us-ascii?Q?onSD7p37ffOls0lpSTEDRe/G/mGWfn88qxAV9K3MbeXyhh2WDhMbFmVOlZxI?=
 =?us-ascii?Q?LYFjhLNNK9S6B+UGhzR7oLuna44ww+rG83EGZBVR3aeGf/8VuNgmyskLlr/T?=
 =?us-ascii?Q?n+s0qI3EE9fJDSu8r2n9pG2+CjTGPGxU8Rsx48E07M4aILyWWvLxJ4Wv10FZ?=
 =?us-ascii?Q?Uriu3U/6IZBMAhfTVE+0yJ9zlzhx7k2dpEciEDL+sk7QwhdkF2udieH3kccR?=
 =?us-ascii?Q?hDJAFsbG60E4gFJFDEforelnxoks/yjx+bOLy4V3NKbm0UhBxJxdXf10PsRx?=
 =?us-ascii?Q?LNdxO619vEEAPVqlrFd+3EnYYdgOFoVL9l2VjOJ+i9YkUG3/HMhCf0fMflJq?=
 =?us-ascii?Q?0Ru0vKOiE0lIVF+JrkKOpa8dIjg3U3DV9BbIZPRYZRswEG6Ir4WZ3t719Dlt?=
 =?us-ascii?Q?lC4Tn29zkfD2JUhiDHWxnRZuxW6gWhmcm0j85HZRvc56POWG6sxN8MBT1RTA?=
 =?us-ascii?Q?A2pqDRDOQuvVSIoxeHcusLOPPVkXhlPjrtA6KaIVKNjK46WglxncoBkG+Xwe?=
 =?us-ascii?Q?CkfBeVNEXTN05+XFn1MhUh+Wl9s/9sPdrGxqZsK5If+RXGxJ4oZiIqzlX1p+?=
 =?us-ascii?Q?+riemRB0bD9ea1JmZdfQfuwTllewywUc8Tw47whVSZpiHy/N6yXYWj+zetVJ?=
 =?us-ascii?Q?sATpJvg/zc7GIZOhM6kMKMkau9sUNcF9tlss0NyH5vyxX9K3UYjjWPHvrKid?=
 =?us-ascii?Q?w9m3oVhDot6FXQGXUsLenCtN7CHiAZDeb3ISf98Qmg+ukg5NUyOhMSFxJywv?=
 =?us-ascii?Q?/+K7SyPq6tcaL+8f8pDg0/kBDmuS9zp05But+jESjRk6op9T2MfgJSSVVufB?=
 =?us-ascii?Q?gKS2xz8fr5XPYqJWnU/byMnOH/8psfmfR06BTjOL5nhKWn1g9lCYmIPg4HEJ?=
 =?us-ascii?Q?CA=3D=3D?=
X-OriginatorOrg: vaisala.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b4b831cd-099d-49bd-2acd-08dc0d42b95d
X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 16:32:20.9787
 (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: WUnmL8GR+u4qrhP1N7rZZP1tkM37y9sz1YZx6e9ktH0FGnE0NWz4VHuPaO5UE/UqdbLFyC6xaEzWK9YdOevXDw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR06MB6497

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 | 15 +++++++++++++++
 drivers/usb/core/hcd.c   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 351ede4b5de2..10ad320cc2f3 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -116,3 +116,18 @@ 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 -1 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:
+		-1 is authorized for all devices (leftover from wireless USB)
+		0 is unauthorized for all devices
+		1 is authorized for all devices
+		2 is authorized for internal devices
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 12b6dfeaf658..f39170c46be7 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_WIRED;
+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 "
-- 
2.39.2