From f4ae986649d0e6faf1e7031657d1d9acab1f8399 Mon Sep 17 00:00:00 2001 From: Tony Asleson Date: Wed, 27 Oct 2021 12:00:59 -0500 Subject: 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. --- src/integritysetup/integrity-util.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/integritysetup') diff --git a/src/integritysetup/integrity-util.c b/src/integritysetup/integrity-util.c index 5970a136b8..c2d2f950de 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); } -- cgit v1.2.1