Messages in this thread Patch in this message |  | | From | david.keisarschm@mail ... | Subject | [PATCH 5/5] Replace invocation of weak PRNG in arch/x86/mm/kaslr.c | Date | Mon, 12 Dec 2022 00:16:08 +0200 |
| |
From: David <david.keisarschm@mail.huji.ac.il>
We changed the invocation of prandom_bytes_state which is considered weak to get_random_bytes. We also omitted the call to the seeding function, since prandom_bytes matintains its own state, so there is no need for seeding here anymore.
Signed-off-by: David <david.keisarschm@mail.huji.ac.il> --- arch/x86/mm/kaslr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index 66c17b449..466111c99 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c @@ -66,7 +66,6 @@ void __init kernel_randomize_memory(void) size_t i; unsigned long vaddr_start, vaddr; unsigned long rand, memory_tb; - struct rnd_state rand_state; unsigned long remain_entropy; unsigned long vmemmap_size; @@ -113,8 +112,6 @@ void __init kernel_randomize_memory(void) for (i = 0; i < ARRAY_SIZE(kaslr_regions); i++) remain_entropy -= get_padding(&kaslr_regions[i]); - prandom_seed_state(&rand_state, kaslr_get_random_long("Memory")); - for (i = 0; i < ARRAY_SIZE(kaslr_regions); i++) { unsigned long entropy; @@ -123,7 +120,7 @@ void __init kernel_randomize_memory(void) * available. */ entropy = remain_entropy / (ARRAY_SIZE(kaslr_regions) - i); - predictable_rng_prandom_bytes_state(&rand_state, &rand, sizeof(rand)); + prandom_bytes(&rand, sizeof(rand)); entropy = (rand % (entropy + 1)) & PUD_MASK; vaddr += entropy; *kaslr_regions[i].base = vaddr; -- 2.38.0
|  |