[0/3] crypto: jitterentropy - bound collection loop

Message

Nicolai Stange Nov. 30, 2021, 2:10 p.m. UTC

Hi,

the sampling loop in jent_gen_entropy() can potentially run indefinitely
w/o making any forward progress, namely if only stuck samples are taken
for whatever reason.

There's a straight-forward way to make the entropy collection more robust,
namely to terminate the loop and report an error if this happens. This
patchset here implements that.

Applies to herbert/cryptodev-2.6.git master.

Thanks!

Nicolai

Nicolai Stange (3):
  crypto: drbg - ignore jitterentropy errors if not in FIPS mode
  crypto: jitter - don't limit ->health_failure check to FIPS mode
  crypto: jitter - quit sample collection loop upon RCT failure

 crypto/drbg.c                | 7 +++++--
 crypto/jitterentropy-kcapi.c | 6 ------
 crypto/jitterentropy.c       | 6 +-----
 crypto/jitterentropy.h       | 1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

Comments

Herbert Xu Dec. 11, 2021, 5:55 a.m. UTC | #1

On Tue, Nov 30, 2021 at 03:10:06PM +0100, Nicolai Stange wrote:
> Hi,
> 
> the sampling loop in jent_gen_entropy() can potentially run indefinitely
> w/o making any forward progress, namely if only stuck samples are taken
> for whatever reason.
> 
> There's a straight-forward way to make the entropy collection more robust,
> namely to terminate the loop and report an error if this happens. This
> patchset here implements that.
> 
> Applies to herbert/cryptodev-2.6.git master.
> 
> Thanks!
> 
> Nicolai
> 
> Nicolai Stange (3):
>   crypto: drbg - ignore jitterentropy errors if not in FIPS mode
>   crypto: jitter - don't limit ->health_failure check to FIPS mode
>   crypto: jitter - quit sample collection loop upon RCT failure
> 
>  crypto/drbg.c                | 7 +++++--
>  crypto/jitterentropy-kcapi.c | 6 ------
>  crypto/jitterentropy.c       | 6 +-----
>  crypto/jitterentropy.h       | 1 -
>  4 files changed, 6 insertions(+), 14 deletions(-)
> 
> -- 
> 2.26.2

All applied.  Thanks.