From: <gregkh@linuxfoundation.org>
To: schwidefsky@de.ibm.com, gregkh@linuxfoundation.org
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "s390/topology: correct allocation of topology information" has been added to the 4.10-stable tree
Date: Sun, 12 Mar 2017 17:26:14 +0100 [thread overview]
Message-ID: <1489335974157194@kroah.com> (raw)
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
reply other threads:[~2017-03-12 17:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489335974157194@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=schwidefsky@de.ibm.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.