[PULL,05/43] hw/mips/boston: Check for error return from boston_fdt_filter()

Commit Message

Peter Maydell Feb. 25, 2025, 6:04 p.m. UTC

The function boston_fdt_filter() can return NULL on errors (in which
case it will print an error message).  When we call this from the
non-FIT-image codepath, we aren't checking the return value, so we
will plough on with a NULL pointer, and segfault in fdt_totalsize().
Check for errors here.

Signed-off-by: Peter Maydell <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Message-id: [e-mail]
---
 hw/mips/boston.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 4690b254dda..de6ce1f163d 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -810,6 +810,10 @@  static void boston_mach_init(MachineState *machine)
 
             dtb_load_data = boston_fdt_filter(s, dtb_file_data,
                                               NULL, &dtb_vaddr);
+            if (!dtb_load_data) {
+                /* boston_fdt_filter() already printed the error for us */
+                exit(1);
+            }
 
             /* Calculate real fdt size after filter */
             dt_size = fdt_totalsize(dtb_load_data);