of: unittest: for strings, account for trailing \0 in property length field

For strings, account for trailing \0 in property length field:

This is consistent with how dtc builds string properties.

Function __of_prop_dup() would misbehave on such properties as it duplicates
properties based on the property length field creating new string values
without trailing \0s.

Signed-off-by: Stefan M Schaeckeler <sschaeck@cisco.com>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Tested-by: Frank Rowand <frank.rowand@sony.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 6bb37c18292a..ecee50d10d14 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -165,20 +165,20 @@ static void __init of_unittest_dynamic(void)
         /* Add a new property - should pass*/
         prop->name = "new-property";
         prop->value = "new-property-data";
-        prop->length = strlen(prop->value);
+        prop->length = strlen(prop->value) + 1;
         unittest(of_add_property(np, prop) == 0, "Adding a new property failed\n");
 
         /* Try to add an existing property - should fail */
         prop++;
         prop->name = "new-property";
         prop->value = "new-property-data-should-fail";
-        prop->length = strlen(prop->value);
+        prop->length = strlen(prop->value) + 1;
         unittest(of_add_property(np, prop) != 0,
                  "Adding an existing property should have failed\n");
 
         /* Try to modify an existing property - should pass */
         prop->value = "modify-property-data-should-pass";
-        prop->length = strlen(prop->value);
+        prop->length = strlen(prop->value) + 1;
         unittest(of_update_property(np, prop) == 0,
                  "Updating an existing property should have passed\n");
 
@@ -186,7 +186,7 @@ static void __init of_unittest_dynamic(void)
         prop++;
         prop->name = "modify-property";
         prop->value = "modify-missing-property-data-should-pass";
-        prop->length = strlen(prop->value);
+        prop->length = strlen(prop->value) + 1;
         unittest(of_update_property(np, prop) == 0,
                  "Updating a missing property should have passed\n");