s390/topology: correct allocation of topology information

BugLink: http://bugs.launchpad.net/bugs/1673118
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 93dcbae1e98de8d885466e52cb73eadc62cd8fe7..ab167620955ce996c59f6536e6b51e780d9cd361 100644 (file)
--- 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:");