Commit 6e9c9686 authored by Rob Herring's avatar Rob Herring
Browse files

scripts/dtc: Update to upstream version v1.6.0-31-gcbca977ea121 



This adds the following commits from upstream:

cbca977ea121 checks: Allow PCI bridge child nodes without an address
73e0f143b73d libfdt: fdt_strerror(): Fix comparison warning
6c2be7d85315 libfdt: fdt_get_string(): Fix sequential write comparison warnings
82525f41d59e libfdt: libfdt_wip: Fix comparison warning
fb1f65f15832 libfdt: fdt_create_with_flags(): Fix comparison warning
f28aa271000b libfdt: fdt_move(): Fix comparison warnings
3d7c6f44195a libfdt: fdt_add_string_(): Fix comparison warning
10f682788c30 libfdt: fdt_node_offset_by_phandle(): Fix comparison warning
07158f4cf2a2 libfdt: overlay: Fix comparison warning
ce9e1f25a7de libfdt: fdt_resize(): Fix comparison warning
faa76fc10bc5 libfdt: fdt_splice_(): Fix comparison warning
54dca0985316 libfdt: fdt_get_string(): Fix comparison warnings
f8e11e61624e libfdt: fdt_grab_space_(): Fix comparison warning
0c43d4d7bf5a libfdt: fdt_mem_rsv(): Fix comparison warnings
442ea3dd1579 libfdt: fdt_offset_ptr(): Fix comparison warnings
ca19c3db2bf6 Makefile: Specify cflags for libyaml
7bb86f1c0956 libfdt: fix fdt_check_node_offset_ w/ VALID_INPUT
3d522abc7571 dtc: Include stdlib.h in util.h
808cdaaf524f dtc: Avoid UB when shifting
3e3138b4a956 libfdt: fix fdt_check_full buffer overrun

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 44ec8b20

scripts/dtc/checks.c

+1 −3
Original line number Diff line number Diff line
@@ -891,10 +891,8 @@ static void check_pci_device_reg(struct check *c, struct dt_info *dti, struct no 
		return;



	prop = get_property(node, "reg");

	if (!prop) {

		FAIL(c, dti, node, "missing PCI reg property");

	if (!prop)

		return;

	}



	cells = (cell_t *)prop->val.val;

	if (cells[1] || cells[2])

scripts/dtc/dtc-parser.y

+2 −2
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ integer_rela: 
	;



integer_shift:

	  integer_shift DT_LSHIFT integer_add { $$ = $1 << $3; }

	| integer_shift DT_RSHIFT integer_add { $$ = $1 >> $3; }

	  integer_shift DT_LSHIFT integer_add { $$ = ($3 < 64) ? ($1 << $3) : 0; }

	| integer_shift DT_RSHIFT integer_add { $$ = ($3 < 64) ? ($1 >> $3) : 0; }

	| integer_add

	;

scripts/dtc/libfdt/fdt.c

+21 −10
Original line number Diff line number Diff line
@@ -134,16 +134,20 @@ int fdt_check_header(const void *fdt) 


const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)

{

	unsigned absoffset = offset + fdt_off_dt_struct(fdt);

	unsigned int uoffset = offset;

	unsigned int absoffset = offset + fdt_off_dt_struct(fdt);



	if (offset < 0)

		return NULL;



	if (!can_assume(VALID_INPUT))

		if ((absoffset < offset)

		if ((absoffset < uoffset)

		    || ((absoffset + len) < absoffset)

		    || (absoffset + len) > fdt_totalsize(fdt))

			return NULL;



	if (can_assume(LATEST) || fdt_version(fdt) >= 0x11)

		if (((offset + len) < offset)

		if (((uoffset + len) < uoffset)

		    || ((offset + len) > fdt_size_dt_struct(fdt)))

			return NULL;
@@ -206,10 +210,11 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) 


int fdt_check_node_offset_(const void *fdt, int offset)

{

	if (can_assume(VALID_INPUT))

		return offset;

	if ((offset < 0) || (offset % FDT_TAGSIZE)

	    || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))

	if (!can_assume(VALID_INPUT)

	    && ((offset < 0) || (offset % FDT_TAGSIZE)))

		return -FDT_ERR_BADOFFSET;



	if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)

		return -FDT_ERR_BADOFFSET;



	return offset;
@@ -217,8 +222,11 @@ int fdt_check_node_offset_(const void *fdt, int offset) 


int fdt_check_prop_offset_(const void *fdt, int offset)

{

	if ((offset < 0) || (offset % FDT_TAGSIZE)

	    || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))

	if (!can_assume(VALID_INPUT)

	    && ((offset < 0) || (offset % FDT_TAGSIZE)))

		return -FDT_ERR_BADOFFSET;



	if (fdt_next_tag(fdt, offset, &offset) != FDT_PROP)

		return -FDT_ERR_BADOFFSET;



	return offset;
@@ -306,9 +314,12 @@ const char *fdt_find_string_(const char *strtab, int tabsize, const char *s) 


int fdt_move(const void *fdt, void *buf, int bufsize)

{

	if (!can_assume(VALID_INPUT) && bufsize < 0)

		return -FDT_ERR_NOSPACE;



	FDT_RO_PROBE(fdt);



	if (fdt_totalsize(fdt) > bufsize)

	if (fdt_totalsize(fdt) > (unsigned int)bufsize)

		return -FDT_ERR_NOSPACE;



	memmove(buf, fdt, fdt_totalsize(fdt));

scripts/dtc/libfdt/fdt_overlay.c

+2 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static int overlay_update_local_node_references(void *fdto, 


		if (fixup_len % sizeof(uint32_t))

			return -FDT_ERR_BADOVERLAY;

		fixup_len /= sizeof(uint32_t);



		tree_val = fdt_getprop(fdto, tree_node, name, &tree_len);

		if (!tree_val) {
@@ -250,7 +251,7 @@ static int overlay_update_local_node_references(void *fdto, 
			return tree_len;

		}



		for (i = 0; i < (fixup_len / sizeof(uint32_t)); i++) {

		for (i = 0; i < fixup_len; i++) {

			fdt32_t adj_val;

			uint32_t poffset;

scripts/dtc/libfdt/fdt_ro.c

+11 −9
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ const char *fdt_get_string(const void *fdt, int stroffset, int *lenp) 


	err = -FDT_ERR_BADOFFSET;

	absoffset = stroffset + fdt_off_dt_strings(fdt);

	if (absoffset >= totalsize)

	if (absoffset >= (unsigned)totalsize)

		goto fail;

	len = totalsize - absoffset;
@@ -61,17 +61,19 @@ const char *fdt_get_string(const void *fdt, int stroffset, int *lenp) 
		if (stroffset < 0)

			goto fail;

		if (can_assume(LATEST) || fdt_version(fdt) >= 17) {

			if (stroffset >= fdt_size_dt_strings(fdt))

			if ((unsigned)stroffset >= fdt_size_dt_strings(fdt))

				goto fail;

			if ((fdt_size_dt_strings(fdt) - stroffset) < len)

				len = fdt_size_dt_strings(fdt) - stroffset;

		}

	} else if (fdt_magic(fdt) == FDT_SW_MAGIC) {

		if ((stroffset >= 0)

		    || (stroffset < -fdt_size_dt_strings(fdt)))

		unsigned int sw_stroffset = -stroffset;



		if ((stroffset >= 0) ||

		    (sw_stroffset > fdt_size_dt_strings(fdt)))

			goto fail;

		if ((-stroffset) < len)

			len = -stroffset;

		if (sw_stroffset < len)

			len = sw_stroffset;

	} else {

		err = -FDT_ERR_INTERNAL;

		goto fail;
@@ -157,8 +159,8 @@ int fdt_generate_phandle(const void *fdt, uint32_t *phandle) 


static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n)

{

	int offset = n * sizeof(struct fdt_reserve_entry);

	int absoffset = fdt_off_mem_rsvmap(fdt) + offset;

	unsigned int offset = n * sizeof(struct fdt_reserve_entry);

	unsigned int absoffset = fdt_off_mem_rsvmap(fdt) + offset;



	if (!can_assume(VALID_INPUT)) {

		if (absoffset < fdt_off_mem_rsvmap(fdt))
@@ -680,7 +682,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) 
{

	int offset;



	if ((phandle == 0) || (phandle == -1))

	if ((phandle == 0) || (phandle == ~0U))

		return -FDT_ERR_BADPHANDLE;



	FDT_RO_PROBE(fdt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE