From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030122; b=eX6sN0cXPW2yrehvixcp1d3mAwL03C8Ifplht4WfP2iKSem6jTSUixf6yAa8ffb9q616 gZPzJjJKNZgQk0tl42j0HA/15NNf5tv2mKS8hLEjoE+ZKRaiSblxSqTL2mCbp/ETVOU7h Ki5V6IE3CclXcI+Y1ZhCvYFry+SPZ94J+fRCRQ/wXUZPEbGADDqAAweh4XRTwZxtuKSJE tim1BAy9+gafPXv32Fnu9xMllcElrjBn+RqUdOMfCKcjxgzR4yYjA1pOn79PQEcuKRua2 hK/RWtQc+3YYdkdpju6WzmHuR6b4tvEZfLmU/mPLWua0q3VRWrPTLyclGhpPf79IAxw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030122; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type:X-Mailer: Content-Transfer-Encoding; bh=uw+Lr20ENqc+9HYStu3sMRzBCc5hrcolDozep5rKKkc=; b=PWEBO08venkuMoLuneyqg8BahpZxB/bKxdaOT5qaGUCO3qBl28ur8lgR823f1DMcatOT z1tYJuMgFYnkHyiUhrSbqIyGoJcc4rQ5i13hXI7mBVN63fA4KO6gsXzJy0FiGmISU7CuI moQa4ehfE9anDdtDZguC+ovJeaBRoV3DnrZ8/cq1N5q9/NmUZ+MthZvyk2oOJ35z8f0qK Zj/dvstSyHcJtOQuWW81ACNWm+rQfZTUoP6hHihuZbPZ/KxD+aTDzOEgZXasXY86E5tuf bCHRJzmRJR9e66YmLS2F87ks2R290pcVphdi8htapzgtIH5zAIHosZ3CJ5fNyaswGlA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ax+vS9xA; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E90A7607216F; Wed, 18 Nov 2026 19:28:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ax+vS9xA Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF45A1F000C7; Wed, 18 Nov 2026 19:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795030121; bh=uw+Lr20ENqc+9HYStu3sMRzBCc5hrcolDozep5rKKkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ax+vS9xAtzDLh/LymrFmOCjh/zAuxLLLRJZq21C6Uo1zTK+92aYkON2LVbl1oSLkD etMFIFH3k+/gdq2MZ6ffj0WNRzASKwYcSfu0nBS/VzQNS3gslBPq6uSg8st6k3o6On RUJPL3qs11cyl7TLWg0adGSb46bbIZBm52+UBe3JtY3YYTtze8NcxmgZRknRUj52qp xCSeszO/4TWYJOxTs7OumtI3wzYMhUQwPQSME4Eqb/Is4/KcvnAOZlRRCZG6TW4xWl 40kaT80LanXRgVdZaTgLsNNo17UvMmFX+owAm7hC3dkCEbEEFgAMmBQrS+YV02PFql fFSDveI/f27tw== From: Leon Romanovsky To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Dmitry Torokhov , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Johannes Berg , Jonathan Corbet , Shuah Khan , Randy Dunlap , Bjorn Helgaas , "Joerg Roedel (AMD)" , Suravee Suthikulpanit , Vasant Hegde , Will Deacon , Robin Murphy , David Woodhouse , Lu Baolu , Johan Hovold , Eric Dumazet , Marcel Holtmann , Luiz Augusto von Dentz , Nipun Gupta , Nikhil Agarwal , Pieter Jansen van Vuuren , Chris Lu , Mans Rullgard , Alan Stern , Jaroslav Kysela , Takashi Iwai , Andrew Morton , Cornelia Huck , Andrew Morton , Jeff Garzik Cc: linux-kernel@vger.kernel.org, driver-core@lists.linux.dev, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-usb@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-acpi@vger.kernel.org, linux-doc@vger.kernel.org, linux-pci@vger.kernel.org, iommu@lists.linux.dev, linux-coco@lists.linux.dev, Alexey Kardashevskiy , Luiz Augusto von Dentz , Greg Kroah-Hartman , linux-sound@vger.kernel.org, Jason Gunthorpe Subject: [PATCH v3 21/31] driver core: Accept device trust policy on the kernel command line Date: Wed, 18 Nov 2026 21:26:51 +0200 Message-ID: <20261118-device-trust-core-v3-21-d655875c4bfb@nvidia.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261118-device-trust-core-v3-0-d655875c4bfb@nvidia.com> References: <20261118-device-trust-core-v3-0-d655875c4bfb@nvidia.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev-18f8f Content-Transfer-Encoding: 8bit From: Leon Romanovsky Blocking devices until initrd attestation also blocks the hardware needed to reach the initrd and perform that attestation. A global policy alone cannot allow those dependencies while keeping other devices blocked. Allow boot policy exceptions for specific bus devices before probing, including devices discovered later. Keep unmatched devices blocked unless the administrator explicitly chooses another default. This makes the exceptions usable with built-in drivers and avoids depending on userspace winning a race against early probing. Signed-off-by: Leon Romanovsky --- Documentation/ABI/testing/sysfs-devices-trust | 2 + Documentation/admin-guide/kernel-parameters.txt | 13 ++- drivers/base/base.h | 8 ++ drivers/base/trust.c | 116 +++++++++++++++++++++++- include/linux/device/trust.h | 1 + 5 files changed, 133 insertions(+), 7 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-devices-trust b/Documentation/ABI/testing/sysfs-devices-trust index 154c5577c65e0..130e5b0d712c2 100644 --- a/Documentation/ABI/testing/sysfs-devices-trust +++ b/Documentation/ABI/testing/sysfs-devices-trust @@ -15,6 +15,8 @@ Description: value may be selected by the bus before the device is registered; otherwise it is "default". The policy is resolved to an active trust level before the device is probed. + A matching device_trust= kernel command-line entry overrides + the initial requested policy before registration. Changes through this attribute require an explicit device trust boot option. Any such option selects an implicit diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 81f98655f5297..e77ce08ac8f79 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1262,9 +1262,18 @@ Kernel parameters device_trust [KNL] Enable device trust with blocked as the implicit default. + device_trust= [KNL] + Set initial device trust policy before probing, including + for devices added after boot. + Format: :=[,...] + Names match exactly as in /sys/bus//devices/. + Policies are default, blocked, adversary, and unrestricted. + Entries override bus policy and device_trust.default. + See Documentation/driver-api/driver-model/device-trust.rst. + device_trust.default= - [KNL] Set initial trust policy for all devices, including - hotplugged devices. + [KNL] Set initial trust policy for devices without a + matching device_trust= entry, including hotplugged devices. Format: { default | blocked | adversary | unrestricted } No trust options selects legacy unrestricted mode, preserving bus policy and existing authorization. Otherwise blocked is the diff --git a/drivers/base/base.h b/drivers/base/base.h index 1e7ee9856fe6f..e8c24d02a5390 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -197,6 +197,14 @@ int device_private_init(struct device *dev); extern const struct attribute_group device_trust_attr_group; +#if IS_ENABLED(CONFIG_KUNIT) +int device_trust_parse_cmdline(const char *options, const struct device *dev, + enum device_trust_policy *policy); +void device_trust_apply_boot_policy(struct device *dev, + enum device_trust_policy policy, + const char *options); +#endif + /* Unrestricted-only manual attachment uses the caller's subsystem serialization. */ void device_trust_init_state(struct device *dev); int device_trust_prepare_unrestricted(struct device *dev, diff --git a/drivers/base/trust.c b/drivers/base/trust.c index 215ea6151ecfc..8211a869fc82e 100644 --- a/drivers/base/trust.c +++ b/drivers/base/trust.c @@ -1,11 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include #include #include #include #include +#include #include "base.h" @@ -13,6 +15,17 @@ static enum device_trust_policy device_trust_default_policy __ro_after_init = DEVICE_TRUST_POLICY_UNRESTRICTED; static bool device_trust_configured __ro_after_init; +/** + * device_trust_enabled - Test whether boot options enabled device trust + * + * Return: True if any device trust option was supplied at boot. + */ +bool device_trust_enabled(void) +{ + return device_trust_configured; +} +EXPORT_SYMBOL_GPL(device_trust_enabled); + static void __init device_trust_configure(void) { if (device_trust_configured) @@ -284,6 +297,88 @@ static struct attribute *device_trust_attrs[] = { const struct attribute_group device_trust_attr_group = { .attrs = device_trust_attrs, }; + +static const char *device_trust_cmdline __ro_after_init; + +static int device_trust_parse_policy(const char *options, const char *target_bus, + const char *target_name, + enum device_trust_policy *policy) +{ + enum device_trust_policy selected = DEVICE_TRUST_POLICY_DEFAULT; + const char *entry = options; + bool matched = false; + + if (!*entry) + return -EINVAL; + + for (;;) { + const char *end = entry + strcspn(entry, ","); + const char *bus_end, *name, *level, *p; + unsigned int i; + + bus_end = memchr(entry, ':', end - entry); + if (!bus_end || bus_end == entry || + memchr(entry, '=', bus_end - entry)) + return -EINVAL; + name = bus_end + 1; + level = memchr(name, '=', end - name); + if (!level || level == name || level + 1 == end) + return -EINVAL; + + for (p = entry; p < end; p++) + if (isspace(*p) || iscntrl(*p) || *p == '"') + return -EINVAL; + + for (i = 0; i < ARRAY_SIZE(device_trust_policy_names); i++) + if (strlen(device_trust_policy_names[i]) == end - level - 1 && + !strncmp(level + 1, device_trust_policy_names[i], + end - level - 1)) + break; + if (i == ARRAY_SIZE(device_trust_policy_names)) + return -EINVAL; + + if (target_bus && target_name && + strlen(target_bus) == bus_end - entry && + !strncmp(target_bus, entry, bus_end - entry) && + strlen(target_name) == level - name && + !strncmp(target_name, name, level - name)) { + selected = i; + matched = true; + } + + if (!*end) + break; + entry = end + 1; + } + + if (matched && policy) + *policy = selected; + return matched; +} + +VISIBLE_IF_KUNIT int device_trust_parse_cmdline(const char *options, + const struct device *dev, + enum device_trust_policy *policy) +{ + return device_trust_parse_policy(options, dev && dev->bus ? dev->bus->name : NULL, + dev ? dev_name(dev) : NULL, policy); +} +EXPORT_SYMBOL_IF_KUNIT(device_trust_parse_cmdline); + +static int __init device_trust_setup(char *str) +{ + device_trust_configure(); + if (device_trust_parse_cmdline(str, NULL, NULL) < 0) { + pr_warn("device_trust: ignoring invalid policy list '%s'\n", str); + return 1; + } + + /* The command-line buffer survives init. */ + device_trust_cmdline = str; + return 1; +} +__setup("device_trust=", device_trust_setup); + static int __init device_trust_default_setup(char *str) { int policy = match_string(device_trust_policy_names, @@ -300,17 +395,28 @@ static int __init device_trust_default_setup(char *str) } __setup("device_trust.default=", device_trust_default_setup); +VISIBLE_IF_KUNIT void device_trust_apply_boot_policy(struct device *dev, + enum device_trust_policy policy, + const char *options) +{ + if (policy != DEVICE_TRUST_POLICY_DEFAULT) + dev->trust_policy = policy; + if (options) + device_trust_parse_cmdline(options, dev, &dev->trust_policy); +} +EXPORT_SYMBOL_IF_KUNIT(device_trust_apply_boot_policy); + /** - * device_trust_init - Apply global boot policy before registration - * @dev: unregistered device with its initial policy set + * device_trust_init - Apply boot policy before registration or bus policy use + * @dev: unregistered device with its bus, name, and default policy set */ void device_trust_init(struct device *dev) { if (dev->trust_committed_level != DEVICE_TRUST_BLOCKED) return; - if (device_trust_configured && - device_trust_default_policy != DEVICE_TRUST_POLICY_DEFAULT) - dev->trust_policy = device_trust_default_policy; + if (device_trust_configured) + device_trust_apply_boot_policy(dev, device_trust_default_policy, + device_trust_cmdline); } EXPORT_SYMBOL_GPL(device_trust_init); diff --git a/include/linux/device/trust.h b/include/linux/device/trust.h index b940dddf10e46..0258e07f938d1 100644 --- a/include/linux/device/trust.h +++ b/include/linux/device/trust.h @@ -40,6 +40,7 @@ enum device_trust_policy { DEVICE_TRUST_POLICY_UNRESTRICTED, }; +bool device_trust_enabled(void); void device_trust_init(struct device *dev); int device_trust_prepare(struct device *dev, const struct device_driver *drv); void device_trust_clear(struct device *dev); -- 2.56.1