[PATCH v2] of: fdt: fix overflows when parsing sizes

[PATCH v2] of: fdt: fix overflows when parsing sizes

[Ahmad Fatoum]

The function dt_struct_advance() is used to advance a pointer to the next
offset within the structure block, while checking that the result is in
bounds.

Unfortunately, the function used a signed size argument. This had the
effect that a too-large size in the FDT wrapped around and caused the
pointer to move backwards.

This issue was found by libfuzzer which generated an FDT that
always triggered an out-of-memory condition: One struct indicated a size
that caused the pointer to move backwards.

The resulting loop allocated memory on every iteration and eventually
ran out.

Fix this by using unsigned sizes and treating wrap around as an
error case.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - remove unneeded (!dt && size) check (Sascha)

@Sascha, I didn't know (or had forgotten) that the FIT image parser is
separate. It lacks a number of checks that were added to harden the FDT
parser. I will submit this separately.
---
 drivers/of/fdt.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 8dca41990c87..4cd33cb04947 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -32,11 +32,12 @@ static inline bool __dt_ptr_ok(const struct fdt_header *fdt, const void *p,
 }
 #define dt_ptr_ok(fdt, p) __dt_ptr_ok(fdt, p, sizeof(*(p)), __alignof__(*(p)))
 
-static inline uint32_t dt_struct_advance(struct fdt_header *f, uint32_t dt, int size)
+static inline uint32_t dt_struct_advance(struct fdt_header *f, uint32_t dt, uint32_t size)
 {
-	dt += size;
-	dt = ALIGN(dt, 4);
+	if (check_add_overflow(dt, size, &dt))
+		return 0;
 
+	dt = ALIGN(dt, 4);
 	if (dt > f->off_dt_struct + f->size_dt_struct)
 		return 0;
 
@@ -165,7 +166,7 @@ static struct device_node *__of_unflatten_dtb(const void *infdt, int size,
 {
 	const void *nodep;	/* property node pointer */
 	uint32_t tag;		/* tag */
-	int  len;		/* length of the property */
+	uint32_t len;		/* length of the property */
 	const struct fdt_property *fdt_prop;
 	const char *pathp, *name;
 	struct device_node *root, *node = NULL;
-- 
2.39.2

Re: [PATCH v2] of: fdt: fix overflows when parsing sizes

[Sascha Hauer]

On Wed, 24 Jul 2024 11:25:52 +0200, Ahmad Fatoum wrote:
> The function dt_struct_advance() is used to advance a pointer to the next
> offset within the structure block, while checking that the result is in
> bounds.
> 
> Unfortunately, the function used a signed size argument. This had the
> effect that a too-large size in the FDT wrapped around and caused the
> pointer to move backwards.
> 
> [...]

Applied, thanks!

[1/1] of: fdt: fix overflows when parsing sizes
      https://git.pengutronix.de/cgit/barebox/commit/?id=26683ab9f27f (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>

Re: [PATCH v2] of: fdt: fix overflows when parsing sizes

[Sascha Hauer]

On Wed, 24 Jul 2024 11:25:52 +0200, Ahmad Fatoum wrote:
> The function dt_struct_advance() is used to advance a pointer to the next
> offset within the structure block, while checking that the result is in
> bounds.
> 
> Unfortunately, the function used a signed size argument. This had the
> effect that a too-large size in the FDT wrapped around and caused the
> pointer to move backwards.
> 
> [...]

Applied, thanks!

[1/1] of: fdt: fix overflows when parsing sizes
      https://git.pengutronix.de/cgit/barebox/commit/?id=f936c591c269 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>