Patch "s390/topology: correct allocation of topology information" has been added to the 4.10-stable tree

Patch "s390/topology: correct allocation of topology information" has been added to the 4.10-stable tree

[gregkh]

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

    s390/topology: correct allocation of topology information

to the 4.10-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-topology-correct-allocation-of-topology-information.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 8676caa4fb7fc02b2c76842a0024919d0caa4b8d Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Sat, 4 Feb 2017 12:38:12 +0100
Subject: s390/topology: correct allocation of topology information

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 8676caa4fb7fc02b2c76842a0024919d0caa4b8d upstream.

The data stored by the STSI instruction can be up to a page in size
but the memblock_virt_alloc allocation for tl_info only specifies
16 bytes. The memory after the short allocation is overwritten
every time arch_update_cpu_topology is called.

Fixes: 8c9105802235 "s390/numa: establish cpu to node mapping early"
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/s390/kernel/topology.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -466,7 +466,7 @@ void __init topology_init_early(void)
 	set_sched_topology(s390_topology);
 	if (!MACHINE_HAS_TOPOLOGY)
 		goto out;
-	tl_info = memblock_virt_alloc(sizeof(*tl_info), PAGE_SIZE);
+	tl_info = memblock_virt_alloc(PAGE_SIZE, PAGE_SIZE);
 	info = tl_info;
 	store_topology(info);
 	pr_info("The CPU configuration topology of the machine is:");


Patches currently in stable-queue which might be from schwidefsky@de.ibm.com are

queue-4.10/s390-kdump-use-linux-elf-note-name-instead-of-core.patch
queue-4.10/s390-dcssblk-fix-device-size-calculation-in-dcssblk_direct_access.patch
queue-4.10/s390-task_size-for-kernel-threads.patch
queue-4.10/kvm-s390-disable-dirty-log-retrieval-for-ucontrol-guests.patch
queue-4.10/s390-use-correct-input-data-address-for-setup_randomness.patch
queue-4.10/s390-topology-correct-allocation-of-topology-information.patch
queue-4.10/s390-make-setup_randomness-work.patch
queue-4.10/s390-chsc-add-exception-handler-for-chsc-instruction.patch
queue-4.10/s390-qdio-clear-dsci-prior-to-scanning-multiple-input-queues.patch