iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

of: of_property_read_string return -ENODATA when !length

Browse Source 
When the length of the string is zero of_property_read_string should
return -ENODATA according to the description of the function.

However, of_property_read_string doesn't check prop->length. If
prop->length is zero, return -ENODATA.

Without this patch the following command in u-boot:

fdt set /chosen/node property-name

results in of_property_read_string returning -EILSEQ when attempting to
read property-name. With this patch, it returns -ENODATA as expected.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220416003028.1315268-1-sstabellini@kernel.org
This commit is contained in:
Stefano Stabellini 2022-04-15 17:30:28 -07:00 committed by Rob Herring
parent f2701e0ffd
commit f688d61925
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/of/property.c
View File

@ -431,6 +431,9 @@ EXPORT_SYMBOL_GPL(of_property_read_variable_u64_array);
* property does not have a value, and -EILSEQ if the string is not * property does not have a value, and -EILSEQ if the string is not
* null-terminated within the length of the property data. * null-terminated within the length of the property data.
* *
* Note that the empty string "" has length of 1, thus -ENODATA cannot
* be interpreted as an empty string.
*
* The out_string pointer is modified only if a valid string can be decoded. * The out_string pointer is modified only if a valid string can be decoded.
*/ */
int of_property_read_string(const struct device_node *np, const char *propname, int of_property_read_string(const struct device_node *np, const char *propname,
@ -439,7 +442,7 @@ int of_property_read_string(const struct device_node *np, const char *propname,
const struct property *prop = of_find_property(np, propname, NULL); const struct property *prop = of_find_property(np, propname, NULL);
if (!prop) if (!prop)
return -EINVAL; return -EINVAL;
if (!prop->value) if (!prop->length)
return -ENODATA; return -ENODATA;
if (strnlen(prop->value, prop->length) >= prop->length) if (strnlen(prop->value, prop->length) >= prop->length)
return -EILSEQ; return -EILSEQ;