diff options
| author | Simon Rettberg | 2020-08-12 12:27:02 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-08-12 12:27:02 +0200 |
| commit | df1f1c469e65156c18dd98931618a7d37c9d8691 (patch) | |
| tree | 12bf4fe1a74701b5f86a696d1e28822dac055765 /src/interface/efi/efi_entropy.c | |
| parent | Revert "Revert "[build] Construct full version number automatically from git ... (diff) | |
| parent | [efi] Use device path to locate filesystem from which we were loaded (diff) | |
| download | ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.gz ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.xz ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/interface/efi/efi_entropy.c')
| -rw-r--r-- | src/interface/efi/efi_entropy.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/interface/efi/efi_entropy.c b/src/interface/efi/efi_entropy.c index a865bad59..f6e82e2c0 100644 --- a/src/interface/efi/efi_entropy.c +++ b/src/interface/efi/efi_entropy.c @@ -222,6 +222,7 @@ static int efi_get_noise_ticks ( noise_sample_t *noise ) { * @ret rc Return status code */ static int efi_get_noise_rng ( noise_sample_t *noise ) { + static uint8_t prev[EFI_ENTROPY_RNG_LEN]; uint8_t buf[EFI_ENTROPY_RNG_LEN]; EFI_STATUS efirc; int rc; @@ -239,6 +240,17 @@ static int efi_get_noise_rng ( noise_sample_t *noise ) { return rc; } + /* Fail (and permanently disable the EFI RNG) if we get + * consecutive identical results. + */ + if ( memcmp ( buf, prev, sizeof ( buf ) ) == 0 ) { + DBGC ( &tick, "ENTROPY detected broken EFI RNG:\n" ); + DBGC_HDA ( &tick, 0, buf, sizeof ( buf ) ); + efirng = NULL; + return -EIO; + } + memcpy ( prev, buf, sizeof ( prev ) ); + /* Reduce random bytes to a single noise sample. This seems * like overkill, but we have no way of knowing how much * entropy is actually present in the bytes returned by the |