73 lines
2.0 KiB
Diff
73 lines
2.0 KiB
Diff
|
From 3a84c2469c31967bc22c0490456f07723ef5fc86 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sumit Bose <sbose@redhat.com>
|
||
|
|
Date: Wed, 20 Mar 2019 11:01:50 +0100
|
||
|
|
Subject: [PATCH 1/4] ensure_keytab_principals: do not leak memory when called
|
||
|
|
twice
|
||
|
|
|
||
|
|
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1630187
|
||
|
|
---
|
||
|
|
library/adenroll.c | 32 +++++++++++++++++++++-----------
|
||
|
|
1 file changed, 21 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/library/adenroll.c b/library/adenroll.c
|
||
|
|
index d1f746c..48cb4cf 100644
|
||
|
|
--- a/library/adenroll.c
|
||
|
|
+++ b/library/adenroll.c
|
||
|
|
@@ -413,6 +413,25 @@ ensure_service_principals (adcli_result res,
|
||
|
|
return res;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void enroll_clear_keytab_principals (adcli_enroll *enroll)
|
||
|
|
+{
|
||
|
|
+ krb5_context k5;
|
||
|
|
+ size_t c;
|
||
|
|
+
|
||
|
|
+ if (enroll->keytab_principals) {
|
||
|
|
+ k5 = adcli_conn_get_krb5_context (enroll->conn);
|
||
|
|
+ return_if_fail (k5 != NULL);
|
||
|
|
+
|
||
|
|
+ for (c = 0; enroll->keytab_principals[c] != NULL; c++)
|
||
|
|
+ krb5_free_principal (k5, enroll->keytab_principals[c]);
|
||
|
|
+
|
||
|
|
+ free (enroll->keytab_principals);
|
||
|
|
+ enroll->keytab_principals = NULL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static adcli_result
|
||
|
|
ensure_keytab_principals (adcli_result res,
|
||
|
|
adcli_enroll *enroll)
|
||
|
|
@@ -430,6 +449,7 @@ ensure_keytab_principals (adcli_result res,
|
||
|
|
k5 = adcli_conn_get_krb5_context (enroll->conn);
|
||
|
|
return_unexpected_if_fail (k5 != NULL);
|
||
|
|
|
||
|
|
+ enroll_clear_keytab_principals (enroll);
|
||
|
|
enroll->keytab_principals = calloc (count + 3, sizeof (krb5_principal));
|
||
|
|
return_unexpected_if_fail (enroll->keytab_principals != NULL);
|
||
|
|
at = 0;
|
||
|
|
@@ -1860,18 +1880,8 @@ static void
|
||
|
|
enroll_clear_state (adcli_enroll *enroll)
|
||
|
|
{
|
||
|
|
krb5_context k5;
|
||
|
|
- int i;
|
||
|
|
-
|
||
|
|
- if (enroll->keytab_principals) {
|
||
|
|
- k5 = adcli_conn_get_krb5_context (enroll->conn);
|
||
|
|
- return_if_fail (k5 != NULL);
|
||
|
|
-
|
||
|
|
- for (i = 0; enroll->keytab_principals[i] != NULL; i++)
|
||
|
|
- krb5_free_principal (k5, enroll->keytab_principals[i]);
|
||
|
|
|
||
|
|
- free (enroll->keytab_principals);
|
||
|
|
- enroll->keytab_principals = NULL;
|
||
|
|
- }
|
||
|
|
+ enroll_clear_keytab_principals (enroll);
|
||
|
|
|
||
|
|
if (enroll->keytab) {
|
||
|
|
k5 = adcli_conn_get_krb5_context (enroll->conn);
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|