From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 26 Apr 2023 08:04:08 +0000 (+0200)
Subject: repart: Turn condition into assert
X-Git-Tag: v254-rc1~622^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=deeae10e26aaa0114bc008285c5dfc721716dbc8;p=thirdparty%2Fsystemd.git

repart: Turn condition into assert

format_verity_hash() should only be called with VERITY_HASH type
partitions, so assert() if that's not the case.
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 3a4808d6a4a..448513ff4d8 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -3559,6 +3559,7 @@ static int partition_format_verity_hash(
 
         assert(context);
         assert(p);
+        assert(p->verity == VERITY_HASH);
         assert(data_node);
 
         if (p->dropped)
@@ -3567,9 +3568,6 @@ static int partition_format_verity_hash(
         if (PARTITION_EXISTS(p)) /* Never format existing partitions */
                 return 0;
 
-        if (p->verity != VERITY_HASH)
-                return 0;
-
         if (partition_defer(p))
                 return 0;