From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 8 Sep 2021 15:28:37 +0000 (+0200)
Subject: dissect-image: tighten assertion checks on verity data
X-Git-Tag: v250-rc1~701^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bff7ea4c4b066b2498de893e3ebeda4638a0ce;p=thirdparty%2Fsystemd.git

dissect-image: tighten assertion checks on verity data
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 20eade5a2a2..8d5c7e08e35 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -638,7 +638,10 @@ int dissect_image(
 
         assert(fd >= 0);
         assert(ret);
+        assert(!verity || verity->designator < 0 || IN_SET(verity->designator, PARTITION_ROOT, PARTITION_USR));
         assert(!verity || verity->root_hash || verity->root_hash_size == 0);
+        assert(!verity || verity->root_hash_sig || verity->root_hash_sig_size == 0);
+        assert(!verity || (verity->root_hash || !verity->root_hash_sig));
         assert(!((flags & DISSECT_IMAGE_GPT_ONLY) && (flags & DISSECT_IMAGE_NO_PARTITION_TABLE)));
 
         /* Probes a disk image, and returns information about what it found in *ret.