From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59338 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934598AbdCLRby (ORCPT ); Sun, 12 Mar 2017 13:31:54 -0400 Subject: Patch "s390/topology: correct allocation of topology information" has been added to the 4.10-stable tree To: schwidefsky@de.ibm.com, gregkh@linuxfoundation.org Cc: , From: Date: Sun, 12 Mar 2017 17:26:14 +0100 Message-ID: <1489335974157194@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 8676caa4fb7fc02b2c76842a0024919d0caa4b8d Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Sat, 4 Feb 2017 12:38:12 +0100 Subject: s390/topology: correct allocation of topology information From: Martin Schwidefsky 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 Signed-off-by: Greg Kroah-Hartman --- 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