[PATCH 18/19] cmd: fix 'fdt get value'

[Heinrich Schuchardt]

The 32bit cells of a device-tree property are big-endian. When printing
them via 0x08x we must first convert to the host endianness.

Remove the restriction to 20 bytes length. This would not allow to read an
SHA256 value.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
---
 cmd/fdt.c      | 26 +++++++++++++++-----------
 test/cmd/fdt.c |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cmd/fdt.c b/cmd/fdt.c
index a67c30b21d5..d6d5b9fdfd2 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -9,14 +9,15 @@
 
 #include <command.h>
 #include <env.h>
+#include <fdt_support.h>
 #include <image.h>
+#include <malloc.h>
+#include <mapmem.h>
+#include <asm/global_data.h>
+#include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/types.h>
-#include <asm/global_data.h>
 #include <linux/libfdt.h>
-#include <fdt_support.h>
-#include <mapmem.h>
-#include <asm/io.h>
 
 #define MAX_LEVEL	32		/* how deeply nested we will go */
 #define SCRATCHPAD	1024		/* bytes of scratchpad memory */
@@ -91,18 +92,21 @@ static int fdt_value_env_set(const void *nodep, int len,
 
 		sprintf(buf, "0x%08X", fdt32_to_cpu(*(nodec + index)));
 		env_set(var, buf);
-	} else if (len % 4 == 0 && len <= 20) {
+	} else {
 		/* Needed to print things like sha1 hashes. */
-		char buf[41];
+		char *buf;
+		const unsigned int *nodec = (const unsigned int *)nodep;
 		int i;
 
-		for (i = 0; i < len; i += sizeof(unsigned int))
+		buf = malloc(2 * len + 7);
+		if (!buf)
+			return CMD_RET_FAILURE;
+		for (i = 0; i < len; i += 4)
 			sprintf(buf + (i * 2), "%08x",
-				*(unsigned int *)(nodep + i));
+				fdt32_to_cpu(*nodec++));
+		buf[2 * len] = 0;
 		env_set(var, buf);
-	} else {
-		printf("error: unprintable value\n");
-		return 1;
+		free(buf);
 	}
 	return 0;
 }
diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c
index 4c3c6308ab4..8ce888770ac 100644
--- a/test/cmd/fdt.c
+++ b/test/cmd/fdt.c
@@ -494,7 +494,7 @@ static int fdt_test_get_value_common(struct unit_test_state *uts,
 	 * longer is an error. This is a special case for handling hashes.
 	 */
 	ut_assertok(fdt_test_get_value_string(uts, node, "regs", NULL,
-					      "3412000000100000", 0));
+					      "0000123400001000", 0));
 
 	/* Test getting 0th element of $node node regs property */
 	ut_assertok(fdt_test_get_value_string(uts, node, "regs", "0", NULL,
-- 
2.51.0