From 885128a7c83ffd864fadb6f6054eaac24763f0fb Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 1 Jul 2015 14:06:28 +0100
Subject: [PATCH] Keep hitting the hardware until it gives us enough ROM

---
 src/fu-rom.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/fu-rom.c b/src/fu-rom.c
index 60258179a..65970ca49 100644
--- a/src/fu-rom.c
+++ b/src/fu-rom.c
@@ -245,6 +245,7 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
 	gchar *str;
 	guint hdr_sz = 0;
 	guint i;
+	guint number_reads = 0;
 	gssize sz;
 	_cleanup_free_ gchar *fn = NULL;
 	_cleanup_error_free_ GError *error_local = NULL;
@@ -287,6 +288,32 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
 		return FALSE;
 	}
 
+	/* ensure we got enough data to fill the buffer */
+	while (sz < 0x4000) {
+		gssize sz_chunk;
+		sz_chunk = g_input_stream_read (priv->stream,
+						buffer + sz,
+						block_sz - sz,
+						cancellable,
+						error);
+		if (sz_chunk == 0)
+			break;
+		g_debug ("ROM returned 0x%04x bytes, adding 0x%04x...",
+			 (guint) sz, (guint) sz_chunk);
+		if (sz_chunk < 0)
+			return FALSE;
+		sz += sz_chunk;
+
+		/* check the firmware isn't serving us small chunks */
+		if (number_reads++ > 16) {
+			g_set_error_literal (error,
+					     FWUPD_ERROR,
+					     FWUPD_ERROR_INVALID_FILE,
+					     "firmware not fulfilling requests");
+			return FALSE;
+		}
+	}
+
 	/* detect signed header and skip to option ROM */
 	if (memcmp (buffer, "NVGI", 4) == 0)
 		hdr_sz = GUINT16_FROM_BE (buffer[0x15]);