summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorZeng Tao <prime.zeng@hisilicon.com>2020-03-04 06:54:52 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-11 11:08:45 +0300
commit4a33691c4cea9eb0a7c66e87248be4637e14b180 (patch)
tree6c918568bd2afd1595c2cf2dadce0872fa68cec5 /drivers/base
parentb8fe128dad8f97cc9af7c55a264d1fc5ab677195 (diff)
downloadlinux-4a33691c4cea9eb0a7c66e87248be4637e14b180.tar.xz
cpu-topology: Fix the potential data corruption
Currently there are only 10 bytes to store the cpu-topology 'name' information. Only 10 bytes copied into cluster/thread/core names. If the cluster ID exceeds 2-digit number, it will result in the data corruption, and ending up in a dead loop in the parsing routines. The same applies to the thread names with more that 3-digit number. This issue was found using the boundary tests under virtualised environment like QEMU. Let us increase the buffer to fix such potential issues. Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Zeng Tao <prime.zeng@hisilicon.com> Link: https://lore.kernel.org/r/1583294092-5929-1-git-send-email-prime.zeng@hisilicon.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/arch_topology.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index b56c33e5b6a8..4cb1616d3871 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -297,7 +297,7 @@ static int __init get_cpu_for_node(struct device_node *node)
static int __init parse_core(struct device_node *core, int package_id,
int core_id)
{
- char name[10];
+ char name[20];
bool leaf = true;
int i = 0;
int cpu;
@@ -343,7 +343,7 @@ static int __init parse_core(struct device_node *core, int package_id,
static int __init parse_cluster(struct device_node *cluster, int depth)
{
- char name[10];
+ char name[20];
bool leaf = true;
bool has_cores = false;
struct device_node *c;