scripts/dtc: Update to upstream commit b06e55c88b9b

Sync to upstream dtc commit b06e55c88b9b ("Prevent crash on modulo by
zero"). This adds the following commits from upstream:

b06e55c Prevent crash on modulo by zero
b433450 Fix some bugs in processing of line directives
d728ad5 Fix crash on nul character in string escape sequence
1ab2205 Gracefully handle bad octal literals
1937095 Prevent crash on division by zero
d0b3ab0 libfdt: Fix undefined behaviour in fdt_offset_ptr()
d4c7c25 libfdt: check for potential overrun in _fdt_splice()
f58799b libfdt: Add some missing symbols to version.lds
af9f26d Remove duplicated -Werror in dtc Makefile
604e61e fdt: Add functions to retrieve strings
8702bd1 fdt: Add a function to get the index of a string
2218387 fdt: Add a function to count strings
554fde2 libfdt: fix comment block of fdt_get_property_namelen()
e5e6df7 fdtdump: Fix bug printing bytestrings with negative values
067829e Remove redundant fdtdump test code
897a429 Move fdt_path_offset alias tests to right tests section
2d1417c Add simple .travis.yml
f6dbc6c guess output file format
5e78dff guess input file format based on file content or file name
8b927bf tests: convert `echo -n` to `printf`
64c46b0 Fix crash with poorly defined #size-cells

Cc: Grant Likely <grant.likely@linaro.org>
Tested-by: Frank Rowand <frank.rowand@sonymobile.com>
Reviewed-by: Frank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 100 insertions, 0 deletions

diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c
index a65e4b5b72b6..e5b313682007 100644
--- a/scripts/dtc/libfdt/fdt_ro.c
+++ b/scripts/dtc/libfdt/fdt_ro.c
@@ -538,6 +538,106 @@ int fdt_stringlist_contains(const char *strlist, int listlen, const char *str)
         return 0;
 }
 
+int fdt_stringlist_count(const void *fdt, int nodeoffset, const char *property)
+{
+        const char *list, *end;
+        int length, count = 0;
+
+        list = fdt_getprop(fdt, nodeoffset, property, &length);
+        if (!list)
+                return -length;
+
+        end = list + length;
+
+        while (list < end) {
+                length = strnlen(list, end - list) + 1;
+
+                /* Abort if the last string isn't properly NUL-terminated. */
+                if (list + length > end)
+                        return -FDT_ERR_BADVALUE;
+
+                list += length;
+                count++;
+        }
+
+        return count;
+}
+
+int fdt_stringlist_search(const void *fdt, int nodeoffset, const char *property,
+                          const char *string)
+{
+        int length, len, idx = 0;
+        const char *list, *end;
+
+        list = fdt_getprop(fdt, nodeoffset, property, &length);
+        if (!list)
+                return -length;
+
+        len = strlen(string) + 1;
+        end = list + length;
+
+        while (list < end) {
+                length = strnlen(list, end - list) + 1;
+
+                /* Abort if the last string isn't properly NUL-terminated. */
+                if (list + length > end)
+                        return -FDT_ERR_BADVALUE;
+
+                if (length == len && memcmp(list, string, length) == 0)
+                        return idx;
+
+                list += length;
+                idx++;
+        }
+
+        return -FDT_ERR_NOTFOUND;
+}
+
+const char *fdt_stringlist_get(const void *fdt, int nodeoffset,
+                               const char *property, int idx,
+                               int *lenp)
+{
+        const char *list, *end;
+        int length;
+
+        list = fdt_getprop(fdt, nodeoffset, property, &length);
+        if (!list) {
+                if (lenp)
+                        *lenp = length;
+
+                return NULL;
+        }
+
+        end = list + length;
+
+        while (list < end) {
+                length = strnlen(list, end - list) + 1;
+
+                /* Abort if the last string isn't properly NUL-terminated. */
+                if (list + length > end) {
+                        if (lenp)
+                                *lenp = -FDT_ERR_BADVALUE;
+
+                        return NULL;
+                }
+
+                if (idx == 0) {
+                        if (lenp)
+                                *lenp = length - 1;
+
+                        return list;
+                }
+
+                list += length;
+                idx--;
+        }
+
+        if (lenp)
+                *lenp = -FDT_ERR_NOTFOUND;
+
+        return NULL;
+}
+
 int fdt_node_check_compatible(const void *fdt, int nodeoffset,
                               const char *compatible)
 {