[ima-evm-utils PATCH v3 02/13] Free public keys list

[Mimi Zohar]

On failure to allocate memory, free the public keys list.

Reviewed-by: Stefan Berger <stef...@linux.ibm.com>
Signed-off-by: Mimi Zohar <zo...@linux.ibm.com>
---
 src/imaevm.h    |  2 ++
 src/libimaevm.c | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/imaevm.h b/src/imaevm.h
index 18d7b0e447e1..64f7db79b33a 100644
--- a/src/imaevm.h
+++ b/src/imaevm.h
@@ -233,6 +233,7 @@ struct RSA_ASN1_template {
 #define DEFAULT_PCR 10
 
 extern struct libimaevm_params imaevm_params;
+struct public_key_entry;
 
 void imaevm_do_hexdump(FILE *fp, const void *ptr, int len, bool cr);
 void imaevm_hexdump(const void *ptr, int len);
@@ -250,6 +251,7 @@ int sign_hash(const char *algo, const unsigned char *hash, 
int size, const char
 int verify_hash(const char *file, const unsigned char *hash, int size, 
unsigned char *sig, int siglen);
 int ima_verify_signature(const char *file, unsigned char *sig, int siglen, 
unsigned char *digest, int digestlen);
 void init_public_keys(const char *keyfiles);
+void imaevm_free_public_keys(struct public_key_entry *public_keys);
 int imaevm_hash_algo_from_sig(unsigned char *sig);
 const char *imaevm_hash_algo_by_id(int algo);
 int calc_hash_sigv3(enum evm_ima_xattr_type type, const char *algo, const 
unsigned char *in_hash, unsigned char *out_hash);
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 244774d01805..61f91df02460 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -399,11 +399,25 @@ static EVP_PKEY *find_keyid(uint32_t keyid)
        return 0;
 }
 
+void imaevm_free_public_keys(struct public_key_entry *public_keys)
+{
+       struct public_key_entry *entry = public_keys, *next;
+
+       while (entry) {
+               next = entry->next;
+               if (entry->key)
+                       free(entry->key);
+               free(entry);
+               entry = next;
+       }
+}
+
 void init_public_keys(const char *keyfiles)
 {
        struct public_key_entry *entry;
        char *tmp_keyfiles, *keyfiles_free;
        char *keyfile;
+       int err = 0;
        int i = 1;
 
        tmp_keyfiles = strdup(keyfiles);
@@ -417,6 +431,7 @@ void init_public_keys(const char *keyfiles)
                entry = malloc(sizeof(struct public_key_entry));
                if (!entry) {
                        perror("malloc");
+                       err = -ENOMEM;
                        break;
                }
 
@@ -433,6 +448,8 @@ void init_public_keys(const char *keyfiles)
                g_public_keys = entry;
        }
        free(keyfiles_free);
+       if (err < 0)
+               imaevm_free_public_keys(g_public_keys);
 }
 
 /*
-- 
2.39.3