Re: [PATCH] [REPOST] tpm: suppress durations sysfs output if notread

From: James Morris
Date: Tue Aug 23 2011 - 19:32:06 EST


On Tue, 23 Aug 2011, Stefan Berger wrote:

> Suppress the output in the 'durations' sysfs entry if they were not read
> during driver initialization. This is similar to other sysfs entries
> that return nothing if for some reason sending the commands to the TPM
> fails.
>
> Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next


>
> ---
> drivers/char/tpm/tpm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> Index: linux-2.6/drivers/char/tpm/tpm.c
> ===================================================================
> --- linux-2.6.orig/drivers/char/tpm/tpm.c
> +++ linux-2.6/drivers/char/tpm/tpm.c
> @@ -963,6 +963,9 @@ ssize_t tpm_show_durations(struct device
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
>
> + if (chip->vendor.duration[TPM_LONG] == 0)
> + return 0;
> +
> return sprintf(buf, "%d %d %d [%s]\n",
> jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
> jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),
>

--
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/