mkcomposefs: Reject dumpfiles without trailing newline

I was doing some more testing and ended up crafting a dumpfile without a trailing newline. It took me a surprising amount of time to figure out that we just ignore data without a trailing newline. Change things to hard error here for now. If this breaks someone, we can probably downgrade this to a warning. Closes: containers#327 Signed-off-by: Colin Walters <[email protected]>
cgwalters · Sep 5, 2024 · 90c1f83 · 90c1f83
1 parent 47042e8
commit 90c1f83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/tests/assets/should-fail-nonl.dump b/tests/assets/should-fail-nonl.dump
@@ -0,0 +1,3 @@
+/ 4096 40555 222 0 0 10 0.0 - - - trusted.foo1=bar-1 user.foo2=bar-2
+/a 0 100644 1 0 0 0 0.0 - - -
+/b 0 100644 1 0 0 0 0.0 - - -
diff --git a/tests/meson.build b/tests/meson.build
@@ -11,6 +11,7 @@ test_assets_small_extra = [
 ]
 
 test_assets_should_fail = [
+  'should-fail-nonl.dump',
   'should-fail-long-link.dump',
   'should-fail-long-xattr-key.dump',
   'should-fail-long-xattr-value.dump',

diff --git a/tools/mkcomposefs.c b/tools/mkcomposefs.c
@@ -643,6 +643,10 @@ static struct lcfs_node_s *tree_from_dump(FILE *input, char **out_err)
 			}
 		}
 	}
+	if (buf.size > 0) {
+		*out_err = make_error("Missing trailing newline");
+		return NULL;
+	}
 
 	buffer_free(&buf);