UPSTREAM: cbfstool: correct size left calculation for "empty" entries

After removing a file sandwiched between two other files, that file
could no longer be re-added at the same location. cbfstool tried to
add the file, and a new "empty" entry, which, together, would no
longer fit, so it continued checking for the next available space.

Change the behavior to add the file if there is enough space for the
file alone, then only add the "empty" entry if there is enough space
for it.

Change-Id: Ia20f690f902aa7ea1a7c5fa62ca33436cf52d2ab
Signed-off-by: Alexandru Gagniuc <>
Signed-off-by: Aaron Durbin <>
Reviewed-by: Duncan Laurie <>
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 44a9fe8..35ca765 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -380,6 +380,10 @@
 		DEBUG("cbfs_add_entry: space at 0x%x+0x%x(%d) bytes\n",
 		      addr, addr_next - addr, addr_next - addr);
+		/* Will the file fit? Don't yet worry if we have space for a new
+		 * "empty" entry. We take care of that later.
+		 */
 		if (addr + need_size > addr_next)
@@ -399,6 +403,16 @@
 			entry = cbfs_find_next_entry(image, entry);
 			new_size = (cbfs_get_entry_addr(image, next) -
 				    cbfs_get_entry_addr(image, entry));
+			/* Entry was added and no space for new "empty" entry */
+			if (new_size < cbfs_calculate_file_header_size("")) {
+				DEBUG("No need for new \"empty\" entry\n");
+				/* No need to increase the size of the just
+				 * stored file to extend to next file. Alignment
+				 * of next file takes care of this.
+				 */
+				return 0;
+			}
 			new_size -= cbfs_calculate_file_header_size("");
 			DEBUG("new size: %d\n", new_size);
 			cbfs_create_empty_entry(image, entry, new_size, "");