On Fri, May 12, 2017 at 3:06 AM, PrasannaKumar Muralidharan wrote:
> On 12 May 2017 at 12:22, PrasannaKumar Muralidharan wrote:
> > On 12 May 2017 at 12:11, Mike Frysinger wrote:
> >> On Fri, May 12, 2017 at 2:15 AM, PrasannaKumar Muralidharan wrote:
> >>> On 12 May 2017 at 09:47, Mike Frysinger wrote:
> >>> > From: Mike Frysinger <vap...@chromium.org>
> >>> >
> >>> > If you build in hwrng & tpm-rng, but boot on a system that doesn't
> >>> > have a tpm (like via KVM), hwrng will spam the logs every 10 seconds
> >>> > with the line:
> >>> > hwrng: no data available
> >>> >
> >>> > This isn't terribly useful, so squelch the error in the ENODEV case.
> >>> > For all other errors, we still warn, and include the actual error.
> >
> > If the boot system does not have a tpm I think registering tpm-rng is
> > not useful. On tpm-rng load instead of registering with hwrng a check
> > can be made whether the system supports tpm. Is this possible?
>
> Completely untested patch below. Will something like this work?
>
> --- a/drivers/char/hw_random/tpm-rng.c
> +++ b/drivers/char/hw_random/tpm-rng.c
> @@ -35,7 +35,13 @@ static int tpm_rng_read(struct hwrng *rng, void
> *data, size_t max, bool wait)
>
> static int __init rng_init(void)
> {
> - return hwrng_register(&tpm_rng);
> + struct tpm_chip *tpm_rng_chip = tpm_chip_find_get(TPM_ANY_NUM);
> + if (tpm_chip) {
> + tpm_put_ops(tpm_rng_chip);
> + return hwrng_register(&tpm_rng);
> + }
> +
> + return -ENODEV;
> }
> module_init(rng_init);
keep in mind that TPMs are often on slow buses like I2C, so i suspect
rng_init runs before those have been initialized. so this patch would
break them.
it would also break if the tpm drivers are modules that don't get
loaded until later, but tpm-rng is built in. or tpm-rng is loaded
first.
-mike
