On Fri, Aug 29, 2025 at 01:51:53PM -0400, Denis Aleksandrov wrote: > Reads on tpm/tpm0/ppi/*operations can become very long on > misconfigured systems. Reading the TPM is a blocking operation, > thus a user could effectively trigger a DOS. > > Resolve this by caching the results and avoiding the blocking > operations after the first read. > > Reported-by: Jan Stancek <jstan...@redhat.com> > Signed-off-by: Denis Aleksandrov <dalek...@redhat.com> > Suggested-by: Jarkko Sakkinen <jar...@kernel.org> > Reviewed-by: Paul Menzel <pmen...@molgen.mpg.de> > --- > > Changes in v3: > - Generalizes ppi info to all architectures. > - Adds reporting of "Not implemented" in ppi operations range. > > drivers/char/tpm/tpm_ppi.c | 88 ++++++++++++++++++++++++++++---------- > 1 file changed, 65 insertions(+), 23 deletions(-) > > diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c > index d53fce1c9d6f..a59b6da69bf6 100644 > --- a/drivers/char/tpm/tpm_ppi.c > +++ b/drivers/char/tpm/tpm_ppi.c > @@ -33,6 +33,21 @@ static const guid_t tpm_ppi_guid = > GUID_INIT(0x3DDDFAA6, 0x361B, 0x4EB4, > 0xA4, 0x24, 0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53); > > +static const char * const tpm_ppi_info[] = { > + "Not implemented", > + "BIOS only", > + "Blocked for OS by system firmware", > + "User required", > + "User not required", > +}; > + > +/* A spinlock to protect access to the cache from concurrent reads */ > +static DEFINE_SPINLOCK(tpm_ppi_lock); > + > +static u32 ppi_operations_cache[PPI_VS_REQ_END + 1]; > +
I might edit the patch just a tiny bit and remove this empty line :-) (nit) > +static bool ppi_cache_populated; > + > static bool tpm_ppi_req_has_parameter(u64 req) > { > return req == 23; > @@ -277,8 +292,7 @@ static ssize_t tpm_show_ppi_response(struct device *dev, > return status; > } > > -static ssize_t show_ppi_operations(acpi_handle dev_handle, char *buf, u32 > start, > - u32 end) > +static ssize_t cache_ppi_operations(acpi_handle dev_handle, char *buf) > { > int i; > u32 ret; > @@ -286,34 +300,22 @@ static ssize_t show_ppi_operations(acpi_handle > dev_handle, char *buf, u32 start, > union acpi_object *obj, tmp; > union acpi_object argv = ACPI_INIT_DSM_ARGV4(1, &tmp); > > - static char *info[] = { > - "Not implemented", > - "BIOS only", > - "Blocked for OS by BIOS", > - "User required", > - "User not required", > - }; > - > if (!acpi_check_dsm(dev_handle, &tpm_ppi_guid, TPM_PPI_REVISION_ID_1, > 1 << TPM_PPI_FN_GETOPR)) > return -EPERM; > > tmp.integer.type = ACPI_TYPE_INTEGER; > - for (i = start; i <= end; i++) { > + for (i = 0; i <= PPI_VS_REQ_END; i++) { > tmp.integer.value = i; > obj = tpm_eval_dsm(dev_handle, TPM_PPI_FN_GETOPR, > ACPI_TYPE_INTEGER, &argv, > TPM_PPI_REVISION_ID_1); > - if (!obj) { > + if (!obj) > return -ENOMEM; > - } else { > - ret = obj->integer.value; > - ACPI_FREE(obj); > - } > > - if (ret > 0 && ret < ARRAY_SIZE(info)) > - len += sysfs_emit_at(buf, len, "%d %d: %s\n", > - i, ret, info[ret]); > + ret = obj->integer.value; > + ppi_operations_cache[i] = ret; > + ACPI_FREE(obj); > } > > return len; > @@ -323,20 +325,60 @@ static ssize_t tpm_show_ppi_tcg_operations(struct > device *dev, > struct device_attribute *attr, > char *buf) > { > + int i; > + ssize_t len = 0; > + u32 ret; > struct tpm_chip *chip = to_tpm_chip(dev); I'd like you to put out v4 but note that it's not your fault. This is just tidying that makes sense to do as part of this patch. Can you reorder these to reverse christmas tree since you are anyway modifying them. I.e. struct tpm_chip *chip = to_tpm_chip(dev); ssize_t len = 0; u32 ret; int i; > > - return show_ppi_operations(chip->acpi_dev_handle, buf, 0, > - PPI_TPM_REQ_MAX); > + spin_lock(&tpm_ppi_lock); > + if (!ppi_cache_populated) { > + len = cache_ppi_operations(chip->acpi_dev_handle, buf); > + > + if (len < 0) > + return len; > + > + ppi_cache_populated = true; > + } > + > + for (i = 0; i <= PPI_TPM_REQ_MAX; i++) { > + ret = ppi_operations_cache[i]; > + if (ret >= 0 && ret < ARRAY_SIZE(tpm_ppi_info)) > + len += sysfs_emit_at(buf, len, "%d %d: %s\n", > + i, ret, > tpm_ppi_info[ret]); > + } > + spin_unlock(&tpm_ppi_lock); > + > + return len; > } > > static ssize_t tpm_show_ppi_vs_operations(struct device *dev, > struct device_attribute *attr, > char *buf) > { > + int i; > + ssize_t len = 0; > + u32 ret; > struct tpm_chip *chip = to_tpm_chip(dev); > > - return show_ppi_operations(chip->acpi_dev_handle, buf, PPI_VS_REQ_START, > - PPI_VS_REQ_END); > + spin_lock(&tpm_ppi_lock); > + if (!ppi_cache_populated) { > + len = cache_ppi_operations(chip->acpi_dev_handle, buf); > + nit: remove empty line also here > + if (len < 0) > + return len; > + > + ppi_cache_populated = true; > + } > + > + for (i = PPI_VS_REQ_START; i <= PPI_VS_REQ_END; i++) { > + ret = ppi_operations_cache[i]; > + if (ret >= 0 && ret < ARRAY_SIZE(tpm_ppi_info)) > + len += sysfs_emit_at(buf, len, "%d %d: %s\n", > + i, ret, > tpm_ppi_info[ret]); > + } > + spin_unlock(&tpm_ppi_lock); > + > + return len; This is really good as now the patch has more value, given than it removes useless computation from everyone. Thanks for revisiting and reconsidering the approach. > } > > static DEVICE_ATTR(version, S_IRUGO, tpm_show_ppi_version, NULL); > -- > 2.48.1 > BR, Jarkko