diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2018-03-25 22:54:22 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-04-11 16:49:38 +1000 |
| commit | 1ec9f1b126e9e0bb8ac54e527c1c54e071301163 (patch) | |
| tree | 54fda4d43e48b0d0a243083f6e43ef8610976fec | |
| parent | e8f69d20ee1e7127b9012381d6f153f341e7c69d (diff) | |
| download | device-tree-compiler-1ec9f1b126e9e0bb8ac54e527c1c54e071301163.tar.gz | |
libfdt: Propagate name errors in fdt_getprop_by_offset()
fdt_getprop_by_offset() doesn't check for errors from fdt_string() - after
all, until very recently it couldn't fail. Now it can, so we need to
propagate errors up to the caller.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | libfdt/fdt_ro.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 347aa7b..d4cec0e 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -461,8 +461,18 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset, prop = fdt_get_property_by_offset_(fdt, offset, lenp); if (!prop) return NULL; - if (namep) - *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); + if (namep) { + const char *name; + int namelen; + name = fdt_get_string(fdt, fdt32_to_cpu(prop->nameoff), + &namelen); + if (!name) { + if (lenp) + *lenp = namelen; + return NULL; + } + *namep = name; + } /* Handle realignment */ if (fdt_version(fdt) < 0x10 && (offset + sizeof(*prop)) % 8 && |