diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-19 16:22:32 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-19 17:42:57 +0000 |
| commit | c1a2086e2d8c4eb4e8630ba752e911ec180dec67 (patch) | |
| tree | a7234d01a8647f98e644e89a3b2675b2de4e1c30 /drivers | |
| parent | a0e27f51ba8a04125c22a95c4d3e98297a7191de (diff) | |
of/selftest: Fix off-by-one error in removal path
The removal path for selftest data has an off by one error that causes
the code to dereference beyond the end of the nodes[] array on the first
pass through. The old code only worked by chance on a lot of platforms,
but the bug was recently exposed on aarch64.
The fix is simple. Decrement the node count before dereferencing, not
after.
Reported-by: Kevin Hilman <khilman@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Gaurav Minocha <gaurav.minocha.os@gmail.com>
Cc: <stable@vger.kernel.org> # v3.17+
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/selftest.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c index 11b873c54a77..e6c14dc400e9 100644 --- a/drivers/of/selftest.c +++ b/drivers/of/selftest.c @@ -896,7 +896,7 @@ static void selftest_data_remove(void) return; } - while (last_node_index >= 0) { + while (last_node_index-- > 0) { if (nodes[last_node_index]) { np = of_find_node_by_path(nodes[last_node_index]->full_name); if (strcmp(np->full_name, "/aliases") != 0) { @@ -908,7 +908,6 @@ static void selftest_data_remove(void) } } } - last_node_index--; } } |