tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_external_dtc/tests/trees.S

314 lines
6.7 KiB
ArmAsm
Raw Normal View History

libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#include <fdt.h>
#include "testdata.h"
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
#define FDTLONG(val) \
.byte ((val) >> 24) & 0xff ; \
.byte ((val) >> 16) & 0xff ; \
.byte ((val) >> 8) & 0xff ; \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
.byte (val) & 0xff ;
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define TREE_HDR(tree) \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
.balign 8 ; \
Remove leading underscores from identifiers In a number of places, dtc and associated tools and test code use leading _ characters on identifiers to flag them as "internal", an idiom taken from the Linux kernel. This is a bad idea in a userspace program, because identifiers with a leading _ are reserved for the C library / system. In some cases, the extra _ served no real purpose, so simply drop it. In others move to the end of the identifier, which is a convention we're free to use for our own purposes. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-18 07:59:43 +02:00
.globl tree ; \
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
tree: \
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
FDTLONG(FDT_MAGIC) ; \
FDTLONG(tree##_end - tree) ; \
FDTLONG(tree##_struct - tree) ; \
FDTLONG(tree##_strings - tree) ; \
FDTLONG(tree##_rsvmap - tree) ; \
FDTLONG(0x11) ; \
FDTLONG(0x10) ; \
FDTLONG(0) ; \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
FDTLONG(tree##_strings_end - tree##_strings) ; \
FDTLONG(tree##_struct_end - tree##_struct) ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
#define RSVMAP_ENTRY(addrh, addrl, lenh, lenl) \
FDTLONG(addrh) ; \
FDTLONG(addrl) ; \
FDTLONG(lenh) ; \
FDTLONG(lenl)
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
libfdt: Add functions to get/add/delete memory reservemap entries This patch adds functions to libfdt for accessing the memory reservation map section of a device tree blob. fdt_num_mem_rsv() retreives the number of reservation entries in a dtb, and fdt_get_mem_rsv() retreives a specific reservation entry. fdt_add_mem_rsv() adds a new entry, and fdt_del_mem_rsv() removes a specific numbered entry. Testcases for these new functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-10 09:12:12 +02:00
#define EMPTY_RSVMAP(tree) \
.balign 8 ; \
tree##_rsvmap: ; \
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
RSVMAP_ENTRY(0, 0, 0, 0) \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
tree##_rsvmap_end: ;
libfdt: Add functions to get/add/delete memory reservemap entries This patch adds functions to libfdt for accessing the memory reservation map section of a device tree blob. fdt_num_mem_rsv() retreives the number of reservation entries in a dtb, and fdt_get_mem_rsv() retreives a specific reservation entry. fdt_add_mem_rsv() adds a new entry, and fdt_del_mem_rsv() removes a specific numbered entry. Testcases for these new functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-10 09:12:12 +02:00
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define PROPHDR(tree, name, len) \
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
FDTLONG(FDT_PROP) ; \
libfdt: Use correct property format Since its beginning, libfdt has used an incorrect definition of the format for a property, putting the name offset before length, rather than the other way around as described in booting-without-of.txt. This corrects the error, making libfdt actually produce and use trees which are compatible with the kernel and dtc. Signed-of-by: David Gibson <david@gibson.dropbear.id.au>
2007-02-23 04:40:14 +01:00
FDTLONG(len) ; \
FDTLONG(tree##_##name - tree##_strings) ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
libfdt: Safer access to strings section fdt_string() is used to retrieve strings from a DT blob's strings section. It's rarely used directly, but is widely used internally. However, it doesn't do any bounds checking, which means in the case of a corrupted blob it could access bad memory, which libfdt is supposed to avoid. This write a safe alternative to fdt_string, fdt_get_string(). It checks both that the given offset is within the string section and that the string it points to is properly \0 terminated within the section. It also returns the string's length as a convenience (since it needs to determine to do the checks anyway). fdt_string() is rewritten in terms of fdt_get_string() for compatibility. Most of the diff here is actually testing infrastructure. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
2017-11-14 12:45:56 +01:00
#define PROP_EMPTY(tree, name) \
PROPHDR(tree, name, 0) ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define PROP_INT(tree, name, val) \
PROPHDR(tree, name, 4) \
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
FDTLONG(val) ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
#define PROP_INT64(tree, name, valh, vall) \
libfdt: Add helpers for 64-bit integer properties In device trees in the world, properties consisting of a single 64-bit integer are not as common as those consisting of a single 32-bit, cell sized integer, but they're common enough that they're worth including convenience functions for. This patch adds helper wrappers of fdt_setprop_inplace(), fdt_setprop() and fdt_appendprop() for handling 64-bit integer quantities in properties. For better consistency with the names of these new *_u64() functions we also add *_u32() functions as alternative names for the existing *_cell() functions handling 32-bit integers. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2012-06-01 06:12:37 +02:00
PROPHDR(tree, name, 8) \
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
FDTLONG(valh) ; \
FDTLONG(vall) ;
libfdt: Add helpers for 64-bit integer properties In device trees in the world, properties consisting of a single 64-bit integer are not as common as those consisting of a single 32-bit, cell sized integer, but they're common enough that they're worth including convenience functions for. This patch adds helper wrappers of fdt_setprop_inplace(), fdt_setprop() and fdt_appendprop() for handling 64-bit integer quantities in properties. For better consistency with the names of these new *_u64() functions we also add *_u32() functions as alternative names for the existing *_cell() functions handling 32-bit integers. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2012-06-01 06:12:37 +02:00
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define PROP_STR(tree, name, str) \
PROPHDR(tree, name, 55f - 54f) \
54: \
asm: Use .asciz and .ascii instead of .string We use the .string pseudo-op both in some of our test assembly files and in our -Oasm output. We expect this to emit a \0 terminated string into the .o file. However for certain targets (e.g. HP PA-RISC) it doesn't include the \0. Use .asciz instead, which explicitly does what we want. There's also one place we can use .ascii (which explicitly emits a string *without* \0 termination) instead of multiple .byte directives. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-07-27 20:30:19 +02:00
.asciz str ; \
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
55: \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
.balign 4 ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define BEGIN_NODE(name) \
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
FDTLONG(FDT_BEGIN_NODE) ; \
asm: Use .asciz and .ascii instead of .string We use the .string pseudo-op both in some of our test assembly files and in our -Oasm output. We expect this to emit a \0 terminated string into the .o file. However for certain targets (e.g. HP PA-RISC) it doesn't include the \0. Use .asciz instead, which explicitly does what we want. There's also one place we can use .ascii (which explicitly emits a string *without* \0 termination) instead of multiple .byte directives. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-07-27 20:30:19 +02:00
.asciz name ; \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
.balign 4 ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define END_NODE \
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
FDTLONG(FDT_END_NODE) ;
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
#define STRING(tree, name, str) \
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
tree##_##name: ; \
asm: Use .asciz and .ascii instead of .string We use the .string pseudo-op both in some of our test assembly files and in our -Oasm output. We expect this to emit a \0 terminated string into the .o file. However for certain targets (e.g. HP PA-RISC) it doesn't include the \0. Use .asciz instead, which explicitly does what we want. There's also one place we can use .ascii (which explicitly emits a string *without* \0 termination) instead of multiple .byte directives. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-07-27 20:30:19 +02:00
.asciz str ;
dtc: Whitespace cleanup This large patch removes all trailing whitespace from dtc (including libfdt, the testsuite and documentation). It also removes a handful of redundant blank lines (at the end of functions, or when there are two blank lines together for no particular reason). As well as anything else, this means that quilt won't whinge when I go to convert the whole of libfdt into a patch to apply to the kernel. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-18 03:44:04 +02:00
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
.data
TREE_HDR(test_tree1)
libfdt: Add functions to get/add/delete memory reservemap entries This patch adds functions to libfdt for accessing the memory reservation map section of a device tree blob. fdt_num_mem_rsv() retreives the number of reservation entries in a dtb, and fdt_get_mem_rsv() retreives a specific reservation entry. fdt_add_mem_rsv() adds a new entry, and fdt_del_mem_rsv() removes a specific numbered entry. Testcases for these new functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-10 09:12:12 +02:00
.balign 8
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
test_tree1_rsvmap:
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
RSVMAP_ENTRY(TEST_ADDR_1H, TEST_ADDR_1L, TEST_SIZE_1H, TEST_SIZE_1L)
RSVMAP_ENTRY(TEST_ADDR_2H, TEST_ADDR_2L, TEST_SIZE_2H, TEST_SIZE_2L)
RSVMAP_ENTRY(0, 0, 0, 0)
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
test_tree1_rsvmap_end:
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
test_tree1_struct:
BEGIN_NODE("")
libfdt: Add functions for handling the "compatible" property This patch adds functions for dealing with the compatible property. fdt_node_check_compatible() can be used to determine whether a node is compatible with a given string and fdt_node_offset_by_compatible() locates nodes with a given compatible string. Testcases for these functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-16 05:58:25 +02:00
PROP_STR(test_tree1, compatible, "test_tree1")
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_INT(test_tree1, prop_int, TEST_VALUE_1)
tests: Avoid 64-bit arithmetic in assembler For testing we (ab)use the assembler to build us a sample dtb, independent of the other tools (dtc and libfdt) that we're trying to test. In a few places this uses 64-bit arithmetic to decompose 64-bit constants into the individual bytes in the blob. Unfortunately, it seems that some builds of GNU as don't support >32 bit arithmetic, though it's not entirely clear to me which do and which don't (Fedora i386 does support 64-bit, Debian arm32 doesn't). Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost of some extra awkwardness because we have to define the values in 32-bit halves. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-06 14:07:30 +02:00
PROP_INT64(test_tree1, prop_int64, TEST_VALUE64_1H, TEST_VALUE64_1L)
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_STR(test_tree1, prop_str, TEST_STRING_1)
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
PROP_INT(test_tree1, address_cells, 1)
PROP_INT(test_tree1, size_cells, 0)
dtc: Whitespace cleanup This large patch removes all trailing whitespace from dtc (including libfdt, the testsuite and documentation). It also removes a handful of redundant blank lines (at the end of functions, or when there are two blank lines together for no particular reason). As well as anything else, this means that quilt won't whinge when I go to convert the whole of libfdt into a patch to apply to the kernel. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-18 03:44:04 +02:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
BEGIN_NODE("subnode@1")
libfdt: Add functions for handling the "compatible" property This patch adds functions for dealing with the compatible property. fdt_node_check_compatible() can be used to determine whether a node is compatible with a given string and fdt_node_offset_by_compatible() locates nodes with a given compatible string. Testcases for these functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-16 05:58:25 +02:00
PROP_STR(test_tree1, compatible, "subnode1")
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
PROP_INT(test_tree1, reg, 1)
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_INT(test_tree1, prop_int, TEST_VALUE_1)
BEGIN_NODE("subsubnode")
libfdt: Add functions for handling the "compatible" property This patch adds functions for dealing with the compatible property. fdt_node_check_compatible() can be used to determine whether a node is compatible with a given string and fdt_node_offset_by_compatible() locates nodes with a given compatible string. Testcases for these functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-16 05:58:25 +02:00
PROP_STR(test_tree1, compatible, "subsubnode1\0subsubnode")
Add a libfdt function to write a property placeholder The existing function to add a new property to a tree being built requires that the entire contents of the new property be passed in. For some applications it is more convenient to be able to add the property contents later, perhaps by reading from a file. This avoids double-buffering of the contents. Add a new function to support this and adjust the existing fdt_property() to use it. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-04-01 17:31:41 +02:00
PROP_STR(test_tree1, placeholder, "this is a placeholder string\0string2")
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_INT(test_tree1, prop_int, TEST_VALUE_1)
END_NODE
libfdt: Fix bug in fdt_subnode_offset_namelen() There's currently an off-by-one bug in fdt_subnode_offset_namelen() which causes it to keep searching after it's finished the subnodes of the given parent, and into the subnodes of siblings of the original node which come after it in the tree. This patch fixes the bug. It also extends the subnode_offset testcase (updating all of the 'test_tree1' example trees in the process) to catch it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2008-10-30 03:41:08 +01:00
BEGIN_NODE("ss1")
END_NODE
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
END_NODE
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
BEGIN_NODE("subnode@2")
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
PROP_INT(test_tree1, reg, 2)
Support ePAPR compliant phandle properties Currently, the Linux kernel, libfdt and dtc, when using flattened device trees encode a node's phandle into a property named "linux,phandle". The ePAPR specification, however - aiming as it is to not be a Linux specific spec - requires that phandles be encoded in a property named simply "phandle". This patch adds support for this newer approach to dtc and libfdt. Specifically: - fdt_get_phandle() will now return the correct phandle if it is supplied in either of these properties - fdt_node_offset_by_phandle() will correctly find a node with the given phandle encoded in either property. - By default, when auto-generating phandles, dtc will encode it into both properties for maximum compatibility. A new -H option allows either only old-style or only new-style properties to be generated. - If phandle properties are explicitly supplied in the dts file, dtc will not auto-generate ones in the alternate format. - If both properties are supplied, dtc will check that they have the same value. - Some existing testcases are updated to use a mix of old and new-style phandles, partially testing the changes. - A new phandle_format test further tests the libfdt support, and the -H option. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-11-26 05:37:13 +01:00
PROP_INT(test_tree1, linux_phandle, PHANDLE_1)
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_INT(test_tree1, prop_int, TEST_VALUE_2)
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
PROP_INT(test_tree1, address_cells, 1)
PROP_INT(test_tree1, size_cells, 0)
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
BEGIN_NODE("subsubnode@0")
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
PROP_INT(test_tree1, reg, 0)
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
PROP_INT(test_tree1, phandle, PHANDLE_2)
libfdt: Add functions for handling the "compatible" property This patch adds functions for dealing with the compatible property. fdt_node_check_compatible() can be used to determine whether a node is compatible with a given string and fdt_node_offset_by_compatible() locates nodes with a given compatible string. Testcases for these functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-16 05:58:25 +02:00
PROP_STR(test_tree1, compatible, "subsubnode2\0subsubnode")
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
PROP_INT(test_tree1, prop_int, TEST_VALUE_2)
END_NODE
libfdt: Fix bug in fdt_subnode_offset_namelen() There's currently an off-by-one bug in fdt_subnode_offset_namelen() which causes it to keep searching after it's finished the subnodes of the given parent, and into the subnodes of siblings of the original node which come after it in the tree. This patch fixes the bug. It also extends the subnode_offset testcase (updating all of the 'test_tree1' example trees in the process) to catch it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2008-10-30 03:41:08 +01:00
BEGIN_NODE("ss2")
END_NODE
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
END_NODE
END_NODE
libfdt: Fix libfdt for little endian hosts This patch fixes a number of embarrasing oversights which meant libfdt did not work correctly on little endian machines. With this patch the testsuite now passes on x86. Device trees are always created big-endian.
2006-12-04 02:52:45 +01:00
FDTLONG(FDT_END)
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
test_tree1_struct_end:
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
test_tree1_strings:
libfdt: Add functions for handling the "compatible" property This patch adds functions for dealing with the compatible property. fdt_node_check_compatible() can be used to determine whether a node is compatible with a given string and fdt_node_offset_by_compatible() locates nodes with a given compatible string. Testcases for these functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-16 05:58:25 +02:00
STRING(test_tree1, compatible, "compatible")
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
STRING(test_tree1, prop_int, "prop-int")
libfdt: Add helpers for 64-bit integer properties In device trees in the world, properties consisting of a single 64-bit integer are not as common as those consisting of a single 32-bit, cell sized integer, but they're common enough that they're worth including convenience functions for. This patch adds helper wrappers of fdt_setprop_inplace(), fdt_setprop() and fdt_appendprop() for handling 64-bit integer quantities in properties. For better consistency with the names of these new *_u64() functions we also add *_u32() functions as alternative names for the existing *_cell() functions handling 32-bit integers. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2012-06-01 06:12:37 +02:00
STRING(test_tree1, prop_int64, "prop-int64")
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
STRING(test_tree1, prop_str, "prop-str")
Support ePAPR compliant phandle properties Currently, the Linux kernel, libfdt and dtc, when using flattened device trees encode a node's phandle into a property named "linux,phandle". The ePAPR specification, however - aiming as it is to not be a Linux specific spec - requires that phandles be encoded in a property named simply "phandle". This patch adds support for this newer approach to dtc and libfdt. Specifically: - fdt_get_phandle() will now return the correct phandle if it is supplied in either of these properties - fdt_node_offset_by_phandle() will correctly find a node with the given phandle encoded in either property. - By default, when auto-generating phandles, dtc will encode it into both properties for maximum compatibility. A new -H option allows either only old-style or only new-style properties to be generated. - If phandle properties are explicitly supplied in the dts file, dtc will not auto-generate ones in the alternate format. - If both properties are supplied, dtc will check that they have the same value. - Some existing testcases are updated to use a mix of old and new-style phandles, partially testing the changes. - A new phandle_format test further tests the libfdt support, and the -H option. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-11-26 05:37:13 +01:00
STRING(test_tree1, linux_phandle, "linux,phandle")
STRING(test_tree1, phandle, "phandle")
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
STRING(test_tree1, reg, "reg")
Add a libfdt function to write a property placeholder The existing function to add a new property to a tree being built requires that the entire contents of the new property be passed in. For some applications it is more convenient to be able to add the property contents later, perhaps by reading from a file. This avoids double-buffering of the contents. Add a new function to support this and adjust the existing fdt_property() to use it. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-04-01 17:31:41 +02:00
STRING(test_tree1, placeholder, "placeholder")
Ensure all tests have matching reg and unit address ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Adjust all the dtc test-cases to conform to this rule. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2013-09-19 14:15:13 +02:00
STRING(test_tree1, address_cells, "#address-cells")
STRING(test_tree1, size_cells, "#size-cells")
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
test_tree1_strings_end:
libfdt - library for manipulating device trees in flattened format Initial revision, read-only and "in-place" (no memmove() required) write operations only.
2006-11-27 06:21:28 +01:00
test_tree1_end:
libfdt: Fix bounds-checking bug in fdt_get_property() The libfdt functions are supposed to behave tolerably well when practical, even if given a corrupted device tree as input. A silly mistake in fdt_get_property() means we're bounds checking against the size of a pointer instead of the size of a property header, meaning we can get bogus behaviour in a corrupted device tree where the structure block ends in what's supposed to be the middle of a property. This patch corrects the problem (fdt_get_property() will now return BADSTRUCTURE in this case), and also adds a testcase to catch the bug.
2006-12-14 05:29:25 +01:00
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
libfdt: Fix bounds-checking bug in fdt_get_property() The libfdt functions are supposed to behave tolerably well when practical, even if given a corrupted device tree as input. A silly mistake in fdt_get_property() means we're bounds checking against the size of a pointer instead of the size of a property header, meaning we can get bogus behaviour in a corrupted device tree where the structure block ends in what's supposed to be the middle of a property. This patch corrects the problem (fdt_get_property() will now return BADSTRUCTURE in this case), and also adds a testcase to catch the bug.
2006-12-14 05:29:25 +01:00
TREE_HDR(truncated_property)
libfdt: Add functions to get/add/delete memory reservemap entries This patch adds functions to libfdt for accessing the memory reservation map section of a device tree blob. fdt_num_mem_rsv() retreives the number of reservation entries in a dtb, and fdt_get_mem_rsv() retreives a specific reservation entry. fdt_add_mem_rsv() adds a new entry, and fdt_del_mem_rsv() removes a specific numbered entry. Testcases for these new functions are also included. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-10 09:12:12 +02:00
EMPTY_RSVMAP(truncated_property)
libfdt: Fix bounds-checking bug in fdt_get_property() The libfdt functions are supposed to behave tolerably well when practical, even if given a corrupted device tree as input. A silly mistake in fdt_get_property() means we're bounds checking against the size of a pointer instead of the size of a property header, meaning we can get bogus behaviour in a corrupted device tree where the structure block ends in what's supposed to be the middle of a property. This patch corrects the problem (fdt_get_property() will now return BADSTRUCTURE in this case), and also adds a testcase to catch the bug.
2006-12-14 05:29:25 +01:00
truncated_property_struct:
BEGIN_NODE("")
PROPHDR(truncated_property, prop_truncated, 4)
/* Oops, no actual property data here */
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
truncated_property_struct_end:
dtc: Whitespace cleanup This large patch removes all trailing whitespace from dtc (including libfdt, the testsuite and documentation). It also removes a handful of redundant blank lines (at the end of functions, or when there are two blank lines together for no particular reason). As well as anything else, this means that quilt won't whinge when I go to convert the whole of libfdt into a patch to apply to the kernel. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-18 03:44:04 +02:00
libfdt: Fix bounds-checking bug in fdt_get_property() The libfdt functions are supposed to behave tolerably well when practical, even if given a corrupted device tree as input. A silly mistake in fdt_get_property() means we're bounds checking against the size of a pointer instead of the size of a property header, meaning we can get bogus behaviour in a corrupted device tree where the structure block ends in what's supposed to be the middle of a property. This patch corrects the problem (fdt_get_property() will now return BADSTRUCTURE in this case), and also adds a testcase to catch the bug.
2006-12-14 05:29:25 +01:00
truncated_property_strings:
STRING(truncated_property, prop_truncated, "truncated")
dtc: Make helper macros in trees.S more flexible This patch makes the helper macros in trees.S use separate labels for the end of each dt subblock, rather than using only start labels. This means that the macros can now be used to create trees with the subblocks in non-standard orders. In addition, it adds a bunch of extra ; after lines of asm code in macros, making them safe to use in nested macros. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-10-18 06:14:09 +02:00
truncated_property_strings_end:
libfdt: Fix bounds-checking bug in fdt_get_property() The libfdt functions are supposed to behave tolerably well when practical, even if given a corrupted device tree as input. A silly mistake in fdt_get_property() means we're bounds checking against the size of a pointer instead of the size of a property header, meaning we can get bogus behaviour in a corrupted device tree where the structure block ends in what's supposed to be the middle of a property. This patch corrects the problem (fdt_get_property() will now return BADSTRUCTURE in this case), and also adds a testcase to catch the bug.
2006-12-14 05:29:25 +01:00
truncated_property_end:
dtc: Implement checks for the format of node and property names This patch adds checks to the checking framework to verify that node and property names contain only legal characters, and in the case of node names there is at most one '@'. At present when coming from dts input, this is mostly already ensured by the grammer, however putting the check later means its easier to generate helpful error messages rather than just "syntax error". For dtb input, these checks replace the older similar check built into flattree.c. Testcases for the checks are also implemented. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2008-02-27 03:45:13 +01:00
TREE_HDR(bad_node_char)
EMPTY_RSVMAP(bad_node_char)
bad_node_char_struct:
BEGIN_NODE("")
BEGIN_NODE("sub$node")
END_NODE
END_NODE
FDTLONG(FDT_END)
bad_node_char_struct_end:
bad_node_char_strings:
bad_node_char_strings_end:
bad_node_char_end:
TREE_HDR(bad_node_format)
EMPTY_RSVMAP(bad_node_format)
bad_node_format_struct:
BEGIN_NODE("")
BEGIN_NODE("subnode@1@2")
END_NODE
END_NODE
FDTLONG(FDT_END)
bad_node_format_struct_end:
bad_node_format_strings:
bad_node_format_strings_end:
bad_node_format_end:
TREE_HDR(bad_prop_char)
EMPTY_RSVMAP(bad_prop_char)
bad_prop_char_struct:
BEGIN_NODE("")
PROP_INT(bad_prop_char, prop, TEST_VALUE_1)
END_NODE
FDTLONG(FDT_END)
bad_prop_char_struct_end:
bad_prop_char_strings:
STRING(bad_prop_char, prop, "prop$erty")
bad_prop_char_strings_end:
bad_prop_char_end:
Catch unsigned 32bit overflow when parsing flattened device tree offsets We have a couple of checks of the form: if (offset+size > totalsize) die(); We need to check that offset+size doesn't overflow, otherwise the check will pass, and we may access past totalsize. Found with AFL. Signed-off-by: Anton Blanchard <anton@samba.org> [Added a testcase] Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2016-01-02 22:43:35 +01:00
/* overflow_size_strings */
.balign 8
Remove leading underscores from identifiers In a number of places, dtc and associated tools and test code use leading _ characters on identifiers to flag them as "internal", an idiom taken from the Linux kernel. This is a bad idea in a userspace program, because identifiers with a leading _ are reserved for the C library / system. In some cases, the extra _ served no real purpose, so simply drop it. In others move to the end of the identifier, which is a convention we're free to use for our own purposes. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2017-10-18 07:59:43 +02:00
.globl ovf_size_strings
Catch unsigned 32bit overflow when parsing flattened device tree offsets We have a couple of checks of the form: if (offset+size > totalsize) die(); We need to check that offset+size doesn't overflow, otherwise the check will pass, and we may access past totalsize. Found with AFL. Signed-off-by: Anton Blanchard <anton@samba.org> [Added a testcase] Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2016-01-02 22:43:35 +01:00
ovf_size_strings:
FDTLONG(FDT_MAGIC)
FDTLONG(ovf_size_strings_end - ovf_size_strings)
FDTLONG(ovf_size_strings_struct - ovf_size_strings)
FDTLONG(ovf_size_strings_strings - ovf_size_strings)
FDTLONG(ovf_size_strings_rsvmap - ovf_size_strings)
FDTLONG(0x11)
FDTLONG(0x10)
FDTLONG(0)
FDTLONG(0xffffffff)
FDTLONG(ovf_size_strings_struct_end - ovf_size_strings_struct)
EMPTY_RSVMAP(ovf_size_strings)
ovf_size_strings_struct:
BEGIN_NODE("")
PROP_INT(ovf_size_strings, bad_string, 0)
END_NODE
FDTLONG(FDT_END)
ovf_size_strings_struct_end:
ovf_size_strings_strings:
STRING(ovf_size_strings, x, "x")
ovf_size_strings_bad_string = ovf_size_strings_strings + 0x10000000
ovf_size_strings_strings_end:
ovf_size_strings_end:
libfdt: Safer access to strings section fdt_string() is used to retrieve strings from a DT blob's strings section. It's rarely used directly, but is widely used internally. However, it doesn't do any bounds checking, which means in the case of a corrupted blob it could access bad memory, which libfdt is supposed to avoid. This write a safe alternative to fdt_string, fdt_get_string(). It checks both that the given offset is within the string section and that the string it points to is properly \0 terminated within the section. It also returns the string's length as a convenience (since it needs to determine to do the checks anyway). fdt_string() is rewritten in terms of fdt_get_string() for compatibility. Most of the diff here is actually testing infrastructure. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
2017-11-14 12:45:56 +01:00
/* truncated_string */
TREE_HDR(truncated_string)
EMPTY_RSVMAP(truncated_string)
truncated_string_struct:
BEGIN_NODE("")
PROP_EMPTY(truncated_string, good_string)
PROP_EMPTY(truncated_string, bad_string)
END_NODE
FDTLONG(FDT_END)
truncated_string_struct_end:
truncated_string_strings:
STRING(truncated_string, good_string, "good")
truncated_string_bad_string:
asm: Use .asciz and .ascii instead of .string We use the .string pseudo-op both in some of our test assembly files and in our -Oasm output. We expect this to emit a \0 terminated string into the .o file. However for certain targets (e.g. HP PA-RISC) it doesn't include the \0. Use .asciz instead, which explicitly does what we want. There's also one place we can use .ascii (which explicitly emits a string *without* \0 termination) instead of multiple .byte directives. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-07-27 20:30:19 +02:00
.ascii "bad"
libfdt: Safer access to strings section fdt_string() is used to retrieve strings from a DT blob's strings section. It's rarely used directly, but is widely used internally. However, it doesn't do any bounds checking, which means in the case of a corrupted blob it could access bad memory, which libfdt is supposed to avoid. This write a safe alternative to fdt_string, fdt_get_string(). It checks both that the given offset is within the string section and that the string it points to is properly \0 terminated within the section. It also returns the string's length as a convenience (since it needs to determine to do the checks anyway). fdt_string() is rewritten in terms of fdt_get_string() for compatibility. Most of the diff here is actually testing infrastructure. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
2017-11-14 12:45:56 +01:00
/* NOTE: terminating \0 deliberately missing */
truncated_string_strings_end:
truncated_string_end:
libfdt: Safer access to memory reservations fdt_num_mem_rsv() and fdt_get_mem_rsv() currently don't sanity check their parameters, or the memory reserve section offset in the header. That means that on a corrupted blob they could access outside of the range of memory that they should. This improves their safety checking, meaning they shouldn't access outside the blob's bounds, even if its contents are badly corrupted. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-03-09 13:28:56 +01:00
/* truncated_memrsv */
TREE_HDR(truncated_memrsv)
truncated_memrsv_struct:
BEGIN_NODE("")
END_NODE
FDTLONG(FDT_END)
truncated_memrsv_struct_end:
truncated_memrsv_strings:
truncated_memrsv_strings_end:
.balign 8
truncated_memrsv_rsvmap:
RSVMAP_ENTRY(TEST_ADDR_1H, TEST_ADDR_1L, TEST_SIZE_1H, TEST_SIZE_1L)
truncated_memrsv_rsvmap_end:
truncated_memrsv_end:
libfdt: Check that there is only one root node At present it is possible to have two root nodes and even access nodes in the 'second' root. Such trees should not be considered valid. This was discovered as part of a security investigation into U-Boot verified boot. Add a check for this to fdt_check_full(). Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Arie Haenel <arie.haenel@intel.com> Reported-by: Julien Lenoir <julien.lenoir@intel.com> Message-Id: <20210323000926.3210733-1-sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-03-23 01:09:25 +01:00
/* two root nodes */
TREE_HDR(two_roots)
EMPTY_RSVMAP(two_roots)
two_roots_struct:
BEGIN_NODE("")
END_NODE
BEGIN_NODE("")
END_NODE
FDTLONG(FDT_END)
two_roots_struct_end:
two_roots_strings:
two_roots_strings_end:
two_roots_end:
libfdt: Check that the root-node name is empty The root node is supposed to have an empty name, but at present this is not checked. The behaviour of such a tree is not well defined. Most software rightly assumes that the root node is at offset 0 and does not check the name. This oddity was discovered as part of a security investigation into U-Boot verified boot. Add a check for this to fdt_check_full(). Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Arie Haenel <arie.haenel@intel.com> Reported-by: Julien Lenoir <julien.lenoir@intel.com> Message-Id: <20210323010410.3222701-2-sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2021-03-23 02:04:10 +01:00
/* root node with a non-empty name */
TREE_HDR(named_root)
EMPTY_RSVMAP(named_root)
named_root_struct:
BEGIN_NODE("fake")
END_NODE
FDTLONG(FDT_END)
named_root_struct_end:
named_root_strings:
named_root_strings_end:
named_root_end:
Reference in a new issue Copy permalink