| Message ID | 20250227094911.497219-2-rui.silva@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | power: regulator: add qcom usb vbus | expand |
On 27/02/2025 10:45, Rui Miguel Silva wrote: > The length of a property includes '\0' in a string type one, so > the length passed by needs to have that in account, if not, > when getting the property value it will fail because it > has the wrong size. > > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> > --- > arch/arm/mach-snapdragon/of_fixup.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c > index 55368dd43b66..ea956a4791d0 100644 > --- a/arch/arm/mach-snapdragon/of_fixup.c > +++ b/arch/arm/mach-snapdragon/of_fixup.c > @@ -86,13 +86,13 @@ static int fixup_qcom_dwc3(struct device_node *glue_np) > } > > /* Overwrite "phy-names" to only contain a single entry */ > - ret = of_write_prop(dwc3, "phy-names", strlen("usb2-phy"), "usb2-phy"); > + ret = of_write_prop(dwc3, "phy-names", strlen("usb2-phy") + 1, "usb2-phy"); > if (ret) { > log_err("Failed to overwrite 'phy-names' property: %d\n", ret); > return ret; > } > > - ret = of_write_prop(dwc3, "maximum-speed", strlen("high-speed"), "high-speed"); > + ret = of_write_prop(dwc3, "maximum-speed", strlen("high-speed") + 1, "high-speed"); > if (ret) { > log_err("Failed to set 'maximum-speed' property: %d\n", ret); > return ret; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c index 55368dd43b66..ea956a4791d0 100644 --- a/arch/arm/mach-snapdragon/of_fixup.c +++ b/arch/arm/mach-snapdragon/of_fixup.c @@ -86,13 +86,13 @@ static int fixup_qcom_dwc3(struct device_node *glue_np) } /* Overwrite "phy-names" to only contain a single entry */ - ret = of_write_prop(dwc3, "phy-names", strlen("usb2-phy"), "usb2-phy"); + ret = of_write_prop(dwc3, "phy-names", strlen("usb2-phy") + 1, "usb2-phy"); if (ret) { log_err("Failed to overwrite 'phy-names' property: %d\n", ret); return ret; } - ret = of_write_prop(dwc3, "maximum-speed", strlen("high-speed"), "high-speed"); + ret = of_write_prop(dwc3, "maximum-speed", strlen("high-speed") + 1, "high-speed"); if (ret) { log_err("Failed to set 'maximum-speed' property: %d\n", ret); return ret;
The length of a property includes '\0' in a string type one, so the length passed by needs to have that in account, if not, when getting the property value it will fail because it has the wrong size. Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> --- arch/arm/mach-snapdragon/of_fixup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)