leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd: fdt: Fix iteration over elements above index 1 in fdt get

Browse Source 
Always increment both the iterator and pointer into the string
property value by length of the current element + 1 (to cater
for the string delimiter), otherwise the element extracted from
the string property value would be extracted from an offset that
is multiple of the length of the first element, instead of sum
of element lengths until select index.

This fixes 'fdt get value' operation for index above 1 (counting
from index 0).

Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fixes: 13982ced2c ("cmd: fdt: Add support for reading stringlist property values")
Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2022-11-14 22:49:59 +01:00 committed by Simon Glass
parent 0524bfc297
commit 7dfcf2a57f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/fdt.c
View File

@ -60,11 +60,14 @@ static int fdt_value_env_set(const void *nodep, int len,
* Iterate over all members in stringlist and find the one at
* offset $index. If no such index exists, indicate failure.
*/
for (i = 0; i < len; i += strlen(nodec) + 1) {
if (index-- > 0)
for (i = 0; i < len; ) {
if (index-- > 0) {
i += strlen(nodec) + 1;
nodec += strlen(nodec) + 1;
continue;
}
env_set(var, nodec + i);
env_set(var, nodec);
return 0;
}