From: Tony Asleson <tasleson@redhat.com>
Date: Wed, 27 Oct 2021 17:00:59 +0000 (-0500)
Subject: integritysetup: Check args to prevent assert
X-Git-Tag: v250-rc1~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4ae986649d0e6faf1e7031657d1d9acab1f8399;p=thirdparty%2Fsystemd.git

integritysetup: Check args to prevent assert

The utility function parse_integrity_options is used to both validate
integritytab options or validate and return values.  In the case where
we are validating only and we have specific value options we will
assert.
---

diff --git a/src/integritysetup/integrity-util.c b/src/integritysetup/integrity-util.c
index 5970a136b8c..c2d2f950de5 100644
--- a/src/integritysetup/integrity-util.c
+++ b/src/integritysetup/integrity-util.c
@@ -48,16 +48,20 @@ int parse_integrity_options(
                         if (ret_commit_time)
                                 *ret_commit_time = tmp_commit_time;
                 } else if ((val = startswith(word, "data-device="))) {
-                        r = free_and_strdup(ret_data_device, val);
-                        if (r < 0)
-                                return log_oom();
+                        if (ret_data_device) {
+                                r = free_and_strdup(ret_data_device, val);
+                                if (r < 0)
+                                        return log_oom();
+                        }
                 } else if ((val = startswith(word, "integrity-algorithm="))) {
-                        r = free_and_strdup(ret_integrity_alg, val);
-                        if (r < 0)
-                                return log_oom();
-                        r = supported_integrity_algorithm(*ret_integrity_alg);
+                        r = supported_integrity_algorithm(val);
                         if (r < 0)
                                 return r;
+                        if (ret_integrity_alg) {
+                                r = free_and_strdup(ret_integrity_alg, val);
+                                if (r < 0)
+                                        return log_oom();
+                        }
                 } else
                         log_warning("Encountered unknown option '%s', ignoring.", word);
         }