From 6f917463ff13457ec3463dfcecc0beb5bc806bb3 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 19 Nov 2016 07:25:40 -0500
Subject: [PATCH] hdb: read_master_key use free_master_key on error

If an error occurs during read_masker_key() processing, use
free_master_key() to perform cleanup.

Change-Id: Idc0ad0131ea4855207232e9773772106cb4f5945
---
 lib/hdb/mkey.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c
index 3e772bb06..895f78f58 100644
--- a/lib/hdb/mkey.c
+++ b/lib/hdb/mkey.c
@@ -147,12 +147,8 @@ read_master_keytab(krb5_context context, const char *filename,
   out:
     krb5_kt_close(context, id);
     if (ret) {
-	/* do not return allocated memory on failure */
-	do {
-	    p = (*mkey)->next;
-	    free(*mkey);
-	    *mkey = p;
-	} while (p != NULL);
+	hdb_free_master_key(context, *mkey);
+	*mkey = NULL;
     }
     return ret;
 }
-- 
2.11.4.GIT