[PATCH 4.17 079/220] of: unittest: for strings, account for trailing \0 in property length field

[Greg Kroah-Hartman]

4.17-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Stefan M Schaeckeler <sscha...@cisco.com>

commit 3b9cf7905fe3ab35ab437b5072c883e609d3498d upstream.

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 <sscha...@cisco.com>
Reviewed-by: Frank Rowand <frank.row...@sony.com>
Tested-by: Frank Rowand <frank.row...@sony.com>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Rob Herring <r...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/of/unittest.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -165,20 +165,20 @@ static void __init of_unittest_dynamic(v
        /* 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(v
        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");