Skip to contentSkip to conversation

Set last_comp_version correctly in new dtb and fix potential version issues in fdt_open_into

PATCH Superseded Justin Covell 2 participants 2 messages Dec 28, 2020 – Dec 29, 2020 1 message not in the archive

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Set last_comp_version correctly in new dtb and fix potential version issues in fdt_open_into

Hi,

I've added checks to fdt_open_into to validate the version before reading into buffer, as well as maintaining the accurate version information of the fdt when loaded into the buffer. Hopefully this would help stop any issues with reading a fdt with a lower than compatible verison into a buffer and it being misrepresented as a current version.

---
 libfdt/fdt_rw.c | 10 ++++++----
 libfdt/fdt_sw.c |  2 +-
 libfdt/libfdt.h |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)
libfdt/fdt_rw.c +6 -4
index 68887b9..feab26c 100644
@@ -428,12 +428,14 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 
 	if (can_assume(LATEST) || fdt_version(fdt) >= 17) {
 		struct_size = fdt_size_dt_struct(fdt);
-	} else {
+	} else if (fdt_version(fdt) == 16) {
 		struct_size = 0;
 		while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END)
 			;
 		if (struct_size < 0)
 			return struct_size;
+	} else {
+		return -FDT_ERR_BADVERSION;
 	}
 
 	if (can_assume(LIBFDT_ORDER) ||
@@ -442,7 +444,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 		err = fdt_move(fdt, buf, bufsize);
 		if (err)
 			return err;
-		fdt_set_version(buf, 17);
+		fdt_set_version(buf, fdt_version(fdt));
 		fdt_set_size_dt_struct(buf, struct_size);
 		fdt_set_totalsize(buf, bufsize);
 		return 0;
@@ -470,8 +472,8 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 
 	fdt_set_magic(buf, FDT_MAGIC);
 	fdt_set_totalsize(buf, bufsize);
-	fdt_set_version(buf, 17);
-	fdt_set_last_comp_version(buf, 16);
+	fdt_set_version(buf, fdt_version(fdt));
+	fdt_set_last_comp_version(buf, fdt_last_comp_version(fdt));
 	fdt_set_boot_cpuid_phys(buf, fdt_boot_cpuid_phys(fdt));
 
 	return 0;
libfdt/fdt_sw.c +1 -1
index 68b543c..4c569ee 100644
@@ -377,7 +377,7 @@ int fdt_finish(void *fdt)
 	fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));
 
 	/* And fix up fields that were keeping intermediate state. */
-	fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
+	fdt_set_last_comp_version(fdt, FDT_LAST_COMPATIBLE_VERSION);
 	fdt_set_magic(fdt, FDT_MAGIC);
 
 	return 0;
libfdt/libfdt.h +1 -0
index 2bc16a8..73467f7 100644
@@ -14,6 +14,7 @@ extern "C" {
 #endif
 
 #define FDT_FIRST_SUPPORTED_VERSION	0x02
+#define FDT_LAST_COMPATIBLE_VERSION 0x10
 #define FDT_LAST_SUPPORTED_VERSION	0x11
 
 /* Error codes: informative error codes */
Signature · 1 line
2.25.1

A message that is not in the archive (sent off-list or not yet received): 20201228234243.5058-1-jujugoboom-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 21 lines · Justin Covell

Hi,

I've added checks to fdt_open_into to validate the version before reading into buffer, as well as maintaining the accurate version information of the fdt when loaded into the buffer. Hopefully this would help stop any issues with reading a fdt with a lower than compatible verison into a buffer and it being misrepresented as a current version.

---
 libfdt/fdt_rw.c | 10 ++++++----
 libfdt/fdt_sw.c |  2 +-
 libfdt/libfdt.h |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)
libfdt/fdt_rw.c +0 -0
index 68887b9..feab26c 100644
@@ -428,12 +428,14 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 
 	if (can_assume(LATEST) || fdt_version(fdt) >= 17) {

libfdt/fdt_rw.c int fdt_open_into(const void *fdt, void *buf, int bufsize) · line 438

Quoted 10 lines
libfdt/fdt_rw.c +3 -1
 		struct_size = fdt_size_dt_struct(fdt);
-	} else {
+	} else if (fdt_version(fdt) == 16) {
 		struct_size = 0;
 		while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END)
 			;
 		if (struct_size < 0)
 			return struct_size;
+	} else {
+		return -FDT_ERR_BADVERSION;

Right, this is further fallout from f1879e1a50ebc3786540a075701ccaead2bfbe1f

libfdt/fdt_rw.c int fdt_open_into(const void *fdt, void *buf, int bufsize) · line 447

Quoted 9 lines
libfdt/fdt_rw.c +1 -1
 	}
 
 	if (can_assume(LIBFDT_ORDER) ||
@@ -442,7 +444,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 		err = fdt_move(fdt, buf, bufsize);
 		if (err)
 			return err;
-		fdt_set_version(buf, 17);
+		fdt_set_version(buf, fdt_version(fdt));

This change doesn't make sense, though. For starters, it's a no-op by definition. Secondly the change to v17 is correct: the difference between v16 and v17 is that v17 adds the struct block size, which we populate in the next line.

libfdt/fdt_rw.c int fdt_open_into(const void *fdt, void *buf, int bufsize) · line 476

Quoted 11 lines
libfdt/fdt_rw.c +2 -2
 		fdt_set_size_dt_struct(buf, struct_size);
 		fdt_set_totalsize(buf, bufsize);
 		return 0;
@@ -470,8 +472,8 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 
 	fdt_set_magic(buf, FDT_MAGIC);
 	fdt_set_totalsize(buf, bufsize);
-	fdt_set_version(buf, 17);
-	fdt_set_last_comp_version(buf, 16);
+	fdt_set_version(buf, fdt_version(fdt));
+	fdt_set_last_comp_version(buf, fdt_last_comp_version(fdt));

Likewise, these are no-ops, and the original version was correct.

libfdt/fdt_sw.c int fdt_finish(void *fdt) · line 380

Quoted 13 lines
libfdt/fdt_rw.c +0 -0
 	fdt_set_boot_cpuid_phys(buf, fdt_boot_cpuid_phys(fdt));
 
 	return 0;
libfdt/fdt_sw.c +1 -1
index 68b543c..4c569ee 100644
@@ -377,7 +377,7 @@ int fdt_finish(void *fdt)
 	fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));
 
 	/* And fix up fields that were keeping intermediate state. */
-	fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
+	fdt_set_last_comp_version(fdt, FDT_LAST_COMPATIBLE_VERSION);

This is a necessary change, though, again because of f1879e1a. So adding a "Fixes" tag to the commit message would be useful.

Quoted 15 lines
libfdt/fdt_sw.c +0 -0
 	fdt_set_magic(fdt, FDT_MAGIC);
 
 	return 0;
libfdt/libfdt.h +1 -0
index 2bc16a8..73467f7 100644
@@ -14,6 +14,7 @@ extern "C" {
 #endif
 
 #define FDT_FIRST_SUPPORTED_VERSION	0x02
+#define FDT_LAST_COMPATIBLE_VERSION 0x10
 #define FDT_LAST_SUPPORTED_VERSION	0x11
 
 /* Error codes: informative error codes */
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson