Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: memory_state_time: fix undefined behavior with missing DT properties

Browse source 
kernelci reports warnings about unintialized variable usage:

drivers/misc/memory_state_time.c:351:12: warning: 'lenf' is used uninitialized in this function [-Wuninitialized]
drivers/misc/memory_state_time.c:321:14: warning: 'lenb' is used uninitialized in this function [-Wuninitialized]

In both cases we try to continue without a DT property but use the
length that has not been assigned at this point. This rearranges the
code in the two functions to bail out earlier in case of an error.

The patch is needed for both android-common-4.9, 4.4 and 3.18.

Link: https://kernelci.org/build/id/591177f459b5147648b12d54/logs/
Fixes: ad3c02f8b3a5 ("ANDROID: Implement memory_state_time, used by qcom,cpubw")
Cc: James Carr <carrja@google.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Arnd Bergmann 2017-05-10 11:21:27 +02:00 committed by Amit Pundir
parent 73580d0697
commit 8009515632
1 changed files with 43 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
drivers/misc/memory_state_time.c
View file

@ -296,27 +296,31 @@ static int get_bw_buckets(struct device *dev)
struct device_node *node = dev->of_node;
of_property_read_u32(node, NUM_SOURCES, &num_sources);
if (of_find_property(node, BW_TBL, &lenb)) {
bandwidths = devm_kzalloc(dev,
sizeof(*bandwidths) * num_sources, GFP_KERNEL);
if (!bandwidths)
return -ENOMEM;
lenb /= sizeof(*bw_buckets);
bw_buckets = devm_kzalloc(dev, lenb * sizeof(*bw_buckets),
GFP_KERNEL);
if (!bw_buckets) {
devm_kfree(dev, bandwidths);
return -ENOMEM;
}
ret = of_property_read_u32_array(node, BW_TBL, bw_buckets,
lenb);
if (ret < 0) {
devm_kfree(dev, bandwidths);
devm_kfree(dev, bw_buckets);
pr_err("Unable to read bandwidth table from device tree.\n");
return ret;
}
if (!of_find_property(node, BW_TBL, &lenb)) {
pr_err("Missing %s property\n", BW_TBL);
return -ENODATA;
}
bandwidths = devm_kzalloc(dev,
sizeof(*bandwidths) * num_sources, GFP_KERNEL);
if (!bandwidths)
return -ENOMEM;
lenb /= sizeof(*bw_buckets);
bw_buckets = devm_kzalloc(dev, lenb * sizeof(*bw_buckets),
GFP_KERNEL);
if (!bw_buckets) {
devm_kfree(dev, bandwidths);
return -ENOMEM;
}
ret = of_property_read_u32_array(node, BW_TBL, bw_buckets,
lenb);
if (ret < 0) {
devm_kfree(dev, bandwidths);
devm_kfree(dev, bw_buckets);
pr_err("Unable to read bandwidth table from device tree.\n");
return ret;
}
curr_bw = 0;
num_buckets = lenb;
return 0;
@ -332,22 +336,26 @@ static int freq_buckets_init(struct device *dev)
int ret, lenf;
struct device_node *node = dev->of_node;
if (of_find_property(node, FREQ_TBL, &lenf)) {
lenf /= sizeof(*freq_buckets);
freq_buckets = devm_kzalloc(dev, lenf * sizeof(*freq_buckets),
GFP_KERNEL);
if (!freq_buckets)
return -ENOMEM;
pr_debug("freqs found len %d\n", lenf);
ret = of_property_read_u32_array(node, FREQ_TBL, freq_buckets,
lenf);
if (ret < 0) {
devm_kfree(dev, freq_buckets);
pr_err("Unable to read frequency table from device tree.\n");
return ret;
}
pr_debug("ret freq %d\n", ret);
if (!of_find_property(node, FREQ_TBL, &lenf)) {
pr_err("Missing %s property\n", FREQ_TBL);
return -ENODATA;
}
lenf /= sizeof(*freq_buckets);
freq_buckets = devm_kzalloc(dev, lenf * sizeof(*freq_buckets),
GFP_KERNEL);
if (!freq_buckets)
return -ENOMEM;
pr_debug("freqs found len %d\n", lenf);
ret = of_property_read_u32_array(node, FREQ_TBL, freq_buckets,
lenf);
if (ret < 0) {
devm_kfree(dev, freq_buckets);
pr_err("Unable to read frequency table from device tree.\n");
return ret;
}
pr_debug("ret freq %d\n", ret);
num_freqs = lenf;
curr_freq = freq_buckets[LOWEST_FREQ];