1 files changed, 28 insertions, 13 deletions

diff --git a/sys/boot/fdt/fdt_loader_cmd.c b/sys/boot/fdt/fdt_loader_cmd.c
index 1ad9a2368602..575585172be9 100644
--- a/sys/boot/fdt/fdt_loader_cmd.c
+++ b/sys/boot/fdt/fdt_loader_cmd.c
@@ -970,40 +970,52 @@ fdt_cmd_hdr(int argc __unused, char *argv[] __unused)
 	ver = fdt_version(fdtp);
 	pager_open();
 	sprintf(line, "\nFlattened device tree header (%p):\n", fdtp);
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " magic                   = 0x%08x\n", fdt_magic(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " size                    = %d\n", fdt_totalsize(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " off_dt_struct           = 0x%08x\n",
 	    fdt_off_dt_struct(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " off_dt_strings          = 0x%08x\n",
 	    fdt_off_dt_strings(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " off_mem_rsvmap          = 0x%08x\n",
 	    fdt_off_mem_rsvmap(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " version                 = %d\n", ver); 
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	sprintf(line, " last compatible version = %d\n",
 	    fdt_last_comp_version(fdtp));
-	pager_output(line);
+	if (pager_output(line))
+		goto out;
 	if (ver >= 2) {
 		sprintf(line, " boot_cpuid              = %d\n",
 		    fdt_boot_cpuid_phys(fdtp));
-		pager_output(line);
+		if (pager_output(line))
+			goto out;
 	}
 	if (ver >= 3) {
 		sprintf(line, " size_dt_strings         = %d\n",
 		    fdt_size_dt_strings(fdtp));
-		pager_output(line);
+		if (pager_output(line))
+			goto out;
 	}
 	if (ver >= 17) {
 		sprintf(line, " size_dt_struct          = %d\n",
 		    fdt_size_dt_struct(fdtp));
-		pager_output(line);
+		if (pager_output(line))
+			goto out;
 	}
+out:
 	pager_close();
 
 	return (CMD_OK);
@@ -1678,15 +1690,18 @@ fdt_cmd_mres(int argc, char *argv[])
 	pager_open();
 	total = fdt_num_mem_rsv(fdtp);
 	if (total > 0) {
-		pager_output("Reserved memory regions:\n");
+		if (pager_output("Reserved memory regions:\n"))
+			goto out;
 		for (i = 0; i < total; i++) {
 			fdt_get_mem_rsv(fdtp, i, &start, &size);
 			sprintf(line, "reg#%d: (start: 0x%jx, size: 0x%jx)\n", 
 			    i, start, size);
-			pager_output(line);
+			if (pager_output(line))
+				goto out;
 		}
 	} else
 		pager_output("No reserved memory regions\n");
+out:
 	pager_close();
 
 	return (CMD_OK);