mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
0350de0eab
commit a87fa1d81a
upstream.
The string property read helpers will run off the end of the buffer if
it is handed a malformed string property. Rework the parsers to make
sure that doesn't happen. At the same time add new test cases to make
sure the functions behave themselves.
The original implementations of of_property_read_string_index() and
of_property_count_strings() both open-coded the same block of parsing
code, each with it's own subtly different bugs. The fix here merges
functions into a single helper and makes the original functions static
inline wrappers around the helper.
One non-bugfix aspect of this patch is the addition of a new wrapper,
of_property_read_string_array(). The new wrapper is needed by the
device_properties feature that Rafael is working on and planning to
merge for v3.19. The implementation is identical both with and without
the new static inline wrapper, so it just got left in to reduce the
churn on the header file.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Darren Hart <darren.hart@intel.com>
[lizf: Backported to 3.4:
- adjust context
- drop selftest hunks that don't apply]
Signed-off-by: Zefan Li <lizefan@huawei.com>
222 lines
7.8 KiB
C
222 lines
7.8 KiB
C
/*
|
|
* Self tests for device tree subsystem
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "### %s(): " fmt, __func__
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/list.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/device.h>
|
|
|
|
static bool selftest_passed = true;
|
|
#define selftest(result, fmt, ...) { \
|
|
selftest_passed &= (result); \
|
|
if (!(result)) \
|
|
pr_err("FAIL %s:%i " fmt, __FILE__, __LINE__, ##__VA_ARGS__); \
|
|
}
|
|
|
|
static void __init of_selftest_parse_phandle_with_args(void)
|
|
{
|
|
struct device_node *np;
|
|
struct of_phandle_args args;
|
|
int rc, i;
|
|
bool passed_all = true;
|
|
|
|
pr_info("start\n");
|
|
np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
|
|
if (!np) {
|
|
pr_err("missing testcase data\n");
|
|
return;
|
|
}
|
|
|
|
for (i = 0; i < 7; i++) {
|
|
bool passed = true;
|
|
rc = of_parse_phandle_with_args(np, "phandle-list",
|
|
"#phandle-cells", i, &args);
|
|
|
|
/* Test the values from tests-phandle.dtsi */
|
|
switch (i) {
|
|
case 0:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 1);
|
|
passed &= (args.args[0] == (i + 1));
|
|
break;
|
|
case 1:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 2);
|
|
passed &= (args.args[0] == (i + 1));
|
|
passed &= (args.args[1] == 0);
|
|
break;
|
|
case 2:
|
|
passed &= (rc == -ENOENT);
|
|
break;
|
|
case 3:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 3);
|
|
passed &= (args.args[0] == (i + 1));
|
|
passed &= (args.args[1] == 4);
|
|
passed &= (args.args[2] == 3);
|
|
break;
|
|
case 4:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 2);
|
|
passed &= (args.args[0] == (i + 1));
|
|
passed &= (args.args[1] == 100);
|
|
break;
|
|
case 5:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 0);
|
|
break;
|
|
case 6:
|
|
passed &= !rc;
|
|
passed &= (args.args_count == 1);
|
|
passed &= (args.args[0] == (i + 1));
|
|
break;
|
|
case 7:
|
|
passed &= (rc == -EINVAL);
|
|
break;
|
|
default:
|
|
passed = false;
|
|
}
|
|
|
|
if (!passed) {
|
|
int j;
|
|
pr_err("index %i - data error on node %s rc=%i regs=[",
|
|
i, args.np->full_name, rc);
|
|
for (j = 0; j < args.args_count; j++)
|
|
printk(" %i", args.args[j]);
|
|
printk(" ]\n");
|
|
|
|
passed_all = false;
|
|
}
|
|
}
|
|
|
|
/* Check for missing list property */
|
|
rc = of_parse_phandle_with_args(np, "phandle-list-missing",
|
|
"#phandle-cells", 0, &args);
|
|
passed_all &= (rc == -EINVAL);
|
|
|
|
/* Check for missing cells property */
|
|
rc = of_parse_phandle_with_args(np, "phandle-list",
|
|
"#phandle-cells-missing", 0, &args);
|
|
passed_all &= (rc == -EINVAL);
|
|
|
|
/* Check for bad phandle in list */
|
|
rc = of_parse_phandle_with_args(np, "phandle-list-bad-phandle",
|
|
"#phandle-cells", 0, &args);
|
|
passed_all &= (rc == -EINVAL);
|
|
|
|
/* Check for incorrectly formed argument list */
|
|
rc = of_parse_phandle_with_args(np, "phandle-list-bad-args",
|
|
"#phandle-cells", 1, &args);
|
|
passed_all &= (rc == -EINVAL);
|
|
|
|
pr_info("end - %s\n", passed_all ? "PASS" : "FAIL");
|
|
}
|
|
|
|
static void __init of_selftest_property_string(void)
|
|
{
|
|
const char *strings[4];
|
|
struct device_node *np;
|
|
int rc;
|
|
|
|
pr_info("start\n");
|
|
np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
|
|
if (!np) {
|
|
pr_err("No testcase data in device tree\n");
|
|
return;
|
|
}
|
|
|
|
rc = of_property_match_string(np, "phandle-list-names", "first");
|
|
selftest(rc == 0, "first expected:0 got:%i\n", rc);
|
|
rc = of_property_match_string(np, "phandle-list-names", "second");
|
|
selftest(rc == 1, "second expected:0 got:%i\n", rc);
|
|
rc = of_property_match_string(np, "phandle-list-names", "third");
|
|
selftest(rc == 2, "third expected:0 got:%i\n", rc);
|
|
rc = of_property_match_string(np, "phandle-list-names", "fourth");
|
|
selftest(rc == -ENODATA, "unmatched string; rc=%i\n", rc);
|
|
rc = of_property_match_string(np, "missing-property", "blah");
|
|
selftest(rc == -EINVAL, "missing property; rc=%i\n", rc);
|
|
rc = of_property_match_string(np, "empty-property", "blah");
|
|
selftest(rc == -ENODATA, "empty property; rc=%i\n", rc);
|
|
rc = of_property_match_string(np, "unterminated-string", "blah");
|
|
selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
|
|
|
|
/* of_property_count_strings() tests */
|
|
rc = of_property_count_strings(np, "string-property");
|
|
selftest(rc == 1, "Incorrect string count; rc=%i\n", rc);
|
|
rc = of_property_count_strings(np, "phandle-list-names");
|
|
selftest(rc == 3, "Incorrect string count; rc=%i\n", rc);
|
|
rc = of_property_count_strings(np, "unterminated-string");
|
|
selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
|
|
rc = of_property_count_strings(np, "unterminated-string-list");
|
|
selftest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
|
|
|
|
/* of_property_read_string_index() tests */
|
|
rc = of_property_read_string_index(np, "string-property", 0, strings);
|
|
selftest(rc == 0 && !strcmp(strings[0], "foobar"), "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
strings[0] = NULL;
|
|
rc = of_property_read_string_index(np, "string-property", 1, strings);
|
|
selftest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
rc = of_property_read_string_index(np, "phandle-list-names", 0, strings);
|
|
selftest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
rc = of_property_read_string_index(np, "phandle-list-names", 1, strings);
|
|
selftest(rc == 0 && !strcmp(strings[0], "second"), "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
rc = of_property_read_string_index(np, "phandle-list-names", 2, strings);
|
|
selftest(rc == 0 && !strcmp(strings[0], "third"), "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
strings[0] = NULL;
|
|
rc = of_property_read_string_index(np, "phandle-list-names", 3, strings);
|
|
selftest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
strings[0] = NULL;
|
|
rc = of_property_read_string_index(np, "unterminated-string", 0, strings);
|
|
selftest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
rc = of_property_read_string_index(np, "unterminated-string-list", 0, strings);
|
|
selftest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
strings[0] = NULL;
|
|
rc = of_property_read_string_index(np, "unterminated-string-list", 2, strings); /* should fail */
|
|
selftest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
|
|
strings[1] = NULL;
|
|
|
|
/* of_property_read_string_array() tests */
|
|
rc = of_property_read_string_array(np, "string-property", strings, 4);
|
|
selftest(rc == 1, "Incorrect string count; rc=%i\n", rc);
|
|
rc = of_property_read_string_array(np, "phandle-list-names", strings, 4);
|
|
selftest(rc == 3, "Incorrect string count; rc=%i\n", rc);
|
|
rc = of_property_read_string_array(np, "unterminated-string", strings, 4);
|
|
selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
|
|
/* -- An incorrectly formed string should cause a failure */
|
|
rc = of_property_read_string_array(np, "unterminated-string-list", strings, 4);
|
|
selftest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
|
|
/* -- parsing the correctly formed strings should still work: */
|
|
strings[2] = NULL;
|
|
rc = of_property_read_string_array(np, "unterminated-string-list", strings, 2);
|
|
selftest(rc == 2 && strings[2] == NULL, "of_property_read_string_array() failure; rc=%i\n", rc);
|
|
strings[1] = NULL;
|
|
rc = of_property_read_string_array(np, "phandle-list-names", strings, 1);
|
|
selftest(rc == 1 && strings[1] == NULL, "Overwrote end of string array; rc=%i, str='%s'\n", rc, strings[1]);
|
|
}
|
|
|
|
static int __init of_selftest(void)
|
|
{
|
|
struct device_node *np;
|
|
|
|
np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
|
|
if (!np) {
|
|
pr_info("No testcase data in device tree; not running tests\n");
|
|
return 0;
|
|
}
|
|
of_node_put(np);
|
|
|
|
pr_info("start of selftest - you will see error messages\n");
|
|
of_selftest_parse_phandle_with_args();
|
|
of_selftest_property_string();
|
|
pr_info("end of selftest - %s\n", selftest_passed ? "PASS" : "FAIL");
|
|
return 0;
|
|
}
|
|
late_initcall(of_selftest);
|