Commit da8fd820 authored Feb 04, 2017 by Heiko Carstens Committed by Martin Schwidefsky Feb 07, 2017

s390: make setup_randomness work



Commit bcfcbb6b ("s390: add system information as device
randomness") intended to add some virtual machine specific information
to the randomness pool.

Unfortunately it uses the page allocator before it is ready to use. In
result the page allocator always returns NULL and the setup_randomness
function never adds anything to the randomness pool.

To fix this use memblock_alloc and memblock_free instead.

Fixes: bcfcbb6b ("s390: add system information as device randomness")
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent f83435c4

arch/s390/kernel/setup.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -822,10 +822,10 @@ static void __init setup_randomness(void)
		{
		struct sysinfo_3_2_2 *vmms;

		vmms = (struct sysinfo_3_2_2 *) alloc_page(GFP_KERNEL);
		if (vmms && stsi(vmms, 3, 2, 2) == 0 && vmms->count)
		vmms = (struct sysinfo_3_2_2 *) memblock_alloc(PAGE_SIZE, PAGE_SIZE);
		if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)
		add_device_randomness(&vmms, vmms->count);
		free_page((unsigned long) vmms);
		memblock_free((unsigned long) vmms, PAGE_SIZE);
		}

		/*

Admin message