Skip to contentSkip to conversation

Patch "s390: use correct input data address for setup_randomness" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

s390: use correct input data address for setup_randomness

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
s390-use-correct-input-data-address-for-setup_randomness.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4920e3cf77347d7d7373552d4839e8d832321313 Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Sun, 5 Feb 2017 23:03:18 +0100
Subject: s390: use correct input data address for setup_randomness

From: Heiko Carstens <[email protected]>

commit 4920e3cf77347d7d7373552d4839e8d832321313 upstream.

The current implementation of setup_randomness uses the stack address and therefore the pointer to the SYSIB 3.2.2 block as input data address. Furthermore the length of the input data is the number of virtual-machine description blocks which is typically one.

This means that typically a single zero byte is fed to add_device_randomness.

Fix both of these and use the address of the first virtual machine description block as input data address and also use the correct length.

Fixes bcfcbb6bae64 ("s390: add system information as device randomness")
---
 arch/s390/kernel/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/setup.c +1 -1
@@ -807,7 +807,7 @@ static void __init setup_randomness(void
 
 	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);
+		add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count);
 	memblock_free((unsigned long) vmms, PAGE_SIZE);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/s390-use-correct-input-data-address-for-setup_randomness.patch queue-4.4/s390-make-setup_randomness-work.patch