Skip to contentSkip to conversation

efi: random: Properly limit the size of the random seed

PATCH New Ben Hutchings 1 participant 1 message Nov 30, 2022 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi: random: Properly limit the size of the random seed

Commit be36f9e7517e ("efi: READ_ONCE rng seed size before munmap") added a READ_ONCE() and also changed the call to add_bootloader_randomness() to use the local size variable. Neither of these changes was actually needed and this was not backported to the 4.19 stable branch.

Commit 161a438d730d ("efi: random: reduce seed size to 32 bytes") reverted the addition of READ_ONCE() and added a limit to the value of size. This depends on the earlier commit, because size can now differ from seed->size, but it was wrongly backported to the 4.19 stable branch by itself.

Apply the missing change to the add_bootloader_randomness() parameter (except that here we are still using add_device_randomness()).

Fixes 0513592520ae ("efi: random: reduce seed size to 32 bytes")
---
 drivers/firmware/efi/efi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/efi.c +1 -1
index f0ef2643b70e..2bbc2289fe09 100644
@@ -566,7 +566,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 					      sizeof(*seed) + size);
 			if (seed != NULL) {
 				pr_notice("seeding entropy pool\n");
-				add_device_randomness(seed->bits, seed->size);
+				add_device_randomness(seed->bits, size);
 				early_memunmap(seed, sizeof(*seed) + size);
 			} else {
 				pr_err("Could not map UEFI random seed!\n");