diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2013-04-10 09:20:21 -0600 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-19 13:43:16 +0100 |
| commit | 2c967221e843d9b6bce90016476057b8c54754f3 (patch) | |
| tree | da082fdb7f11691b258df84e6fdff1e77df04e8c | |
| parent | cd29031261277b51cc8fc77f7006a1b149cd224f (diff) | |
cpufreq/arm_big_little.c: Fixing non-terminated string
When declaring char name[9] = "cluster";
name[7] is equal to the string termination character '\0'.
But later on doing:
name[7] = cluster_id + '0';
clobbers the termination character, leaving non terminated
strings in the system and potentially causing undertermined
behavior.
By initialising name[9] to "clusterX" the 8th character is
set to '\0' and affecting the 7th character with the cluster
number doesn't overwite anything.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
[ np: The C standard says that the reminder of an initialized array of
a known size should be initialized to zero and therefore this patch is
unneeded, however this patch makes the intent more explicit to others
reading the code. ]
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | drivers/clk/versatile/clk-vexpress-spc.c | 2 | ||||
| -rw-r--r-- | drivers/cpufreq/arm_big_little.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-spc.c b/drivers/clk/versatile/clk-vexpress-spc.c index 37125bf48cb..bb566e244b0 100644 --- a/drivers/clk/versatile/clk-vexpress-spc.c +++ b/drivers/clk/versatile/clk-vexpress-spc.c @@ -102,7 +102,7 @@ struct clk *vexpress_clk_register_spc(const char *name, int cluster_id) #if defined(CONFIG_OF) void __init vexpress_clk_of_register_spc(void) { - char name[14] = "cpu-cluster."; + char name[14] = "cpu-cluster.X"; struct device_node *node = NULL; struct clk *clk; const u32 *val; diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index f106106f78c..7c2be81f7dc 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c @@ -322,7 +322,7 @@ static void put_cluster_clk_and_freq_table(struct device *cpu_dev) static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) { u32 cluster = cpu_to_cluster(cpu_dev->id); - char name[14] = "cpu-cluster."; + char name[14] = "cpu-cluster.X"; int ret; if (atomic_inc_return(&cluster_usage[cluster]) != 1) |