diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-08 11:57:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-08 11:57:58 +0300 |
| commit | 6120681bdf1a1c648e8c555704b71e04abe2e899 (patch) | |
| tree | a8a3f55c4ed771dc57082d8af2f8d28ab6e5d341 /drivers/firmware/efi/efi.c | |
| parent | 3be5f0d286dc944dee65fdcbddfc4d314f7d4482 (diff) | |
| parent | d6c066fda90d578aacdf19771a027ed484a79825 (diff) | |
| download | linux-6120681bdf1a1c648e8c555704b71e04abe2e899.tar.xz | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 1d5e9a030cb1..3f41947a4d66 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -582,7 +582,7 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, seed = early_memremap(efi_rng_seed, sizeof(*seed)); if (seed != NULL) { - size = seed->size; + size = READ_ONCE(seed->size); early_memunmap(seed, sizeof(*seed)); } else { pr_err("Could not map UEFI random seed!\n"); @@ -592,7 +592,7 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, sizeof(*seed) + size); if (seed != NULL) { pr_notice("seeding entropy pool\n"); - add_bootloader_randomness(seed->bits, seed->size); + add_bootloader_randomness(seed->bits, size); early_memunmap(seed, sizeof(*seed) + size); } else { pr_err("Could not map UEFI random seed!\n"); |