commit 1fceb4aa7db2d4245a05c03dabf8fec919a5e463
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 17 01:09:53 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 17 01:09:53 2022 +0000
tree b71a50db0d9ab2a849f4c838a460d4b506f866a3
parent ff9e1fa39a3307aa2a1b8039c5377e17a4535b2c
parent bf9eb71d0716be75f8aad5c5400f2cc8569d08cf

Merge cherrypicks of [19524921] into sc-platform-release.

Change-Id: Ic9f86f6fa0f977306747f07a6bf878aaf4901bbc

libfdt/fdt.c

diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index c28fcc1..82521b7 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -134,16 +134,20 @@
 
 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;