public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes
@ 2014-07-25 22:19 Stephen Boyd
  2014-07-28  9:49 ` Torsten Duwe
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2014-07-25 22:19 UTC (permalink / raw)
  To: Theodore Ts'o
  Cc: linux-kernel, Matt Mackall, Herbert Xu, H . Peter Anvin,
	Torsten Duwe

rng_get_data() returns the number of bytes read from the hardware.
The entropy argument to add_hwgenerator_randomness() is passed
directly to credit_entropy_bits() so we should be passing the
number of bits, not bytes here.

Fixes: be4000bc464 "hwrng: create filler thread"
Cc: Torsten Duwe <duwe@suse.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/char/hw_random/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index dc80cdab733d..6e02ec103cc7 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -362,7 +362,7 @@ static int hwrng_fillfn(void *unused)
 			continue;
 		}
 		add_hwgenerator_randomness((void *)rng_fillbuf, rc,
-					   (rc*current_quality)>>10);
+					   rc * current_quality * 8 >> 10);
 	}
 	hwrng_fill = NULL;
 	return 0;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes
  2014-07-25 22:19 [PATCH] hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes Stephen Boyd
@ 2014-07-28  9:49 ` Torsten Duwe
  2014-08-05 22:23   ` Theodore Ts'o
  0 siblings, 1 reply; 3+ messages in thread
From: Torsten Duwe @ 2014-07-28  9:49 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: Theodore Ts'o, linux-kernel, Matt Mackall, Herbert Xu,
	H . Peter Anvin

On Fri, Jul 25, 2014 at 03:19:18PM -0700, Stephen Boyd wrote:
> rng_get_data() returns the number of bytes read from the hardware.
> The entropy argument to add_hwgenerator_randomness() is passed
> directly to credit_entropy_bits() so we should be passing the
> number of bits, not bytes here.

Absolutely correct.

Acked-by: Torsten Duwe <duwe@suse.de>

> Fixes: be4000bc464 "hwrng: create filler thread"
> Cc: Torsten Duwe <duwe@suse.de>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>  drivers/char/hw_random/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
> index dc80cdab733d..6e02ec103cc7 100644
> --- a/drivers/char/hw_random/core.c
> +++ b/drivers/char/hw_random/core.c
> @@ -362,7 +362,7 @@ static int hwrng_fillfn(void *unused)
>  			continue;
>  		}
>  		add_hwgenerator_randomness((void *)rng_fillbuf, rc,
> -					   (rc*current_quality)>>10);
> +					   rc * current_quality * 8 >> 10);
>  	}
>  	hwrng_fill = NULL;
>  	return 0;
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes
  2014-07-28  9:49 ` Torsten Duwe
@ 2014-08-05 22:23   ` Theodore Ts'o
  0 siblings, 0 replies; 3+ messages in thread
From: Theodore Ts'o @ 2014-08-05 22:23 UTC (permalink / raw)
  To: Torsten Duwe
  Cc: Stephen Boyd, linux-kernel, Matt Mackall, Herbert Xu,
	H . Peter Anvin

On Mon, Jul 28, 2014 at 11:49:29AM +0200, Torsten Duwe wrote:
> On Fri, Jul 25, 2014 at 03:19:18PM -0700, Stephen Boyd wrote:
> > rng_get_data() returns the number of bytes read from the hardware.
> > The entropy argument to add_hwgenerator_randomness() is passed
> > directly to credit_entropy_bits() so we should be passing the
> > number of bits, not bytes here.
> 
> Absolutely correct.
> 
> Acked-by: Torsten Duwe <duwe@suse.de>

Applied, thanks.

					- Ted

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-08-05 22:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25 22:19 [PATCH] hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes Stephen Boyd
2014-07-28  9:49 ` Torsten Duwe
2014-08-05 22:23   ` Theodore Ts'o

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox