Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Steve Dickson <steved@redhat.com>
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH] gssd: Closed a memory leak in find_keytab_entry()
Date:   Wed, 12 Feb 2020 14:05:15 -0500
Message-Id: <20200212190515.7443-1-steved@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

When 'adhostoverride' is "not set", which
is most of the time, adhostoverride is not freed.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/gssd/krb5_util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index a1c43d2..85f60ae 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -799,7 +799,7 @@ find_keytab_entry(krb5_context context, krb5_keytab k=
t,
 	int tried_all =3D 0, tried_default =3D 0, tried_upper =3D 0;
 	krb5_principal princ;
 	const char *notsetstr =3D "not set";
-	char *adhostoverride;
+	char *adhostoverride =3D NULL;
=20
=20
 	/* Get full target hostname */
@@ -827,7 +827,6 @@ find_keytab_entry(krb5_context context, krb5_keytab k=
t,
 				adhostoverride);
 	        /* No overflow: Windows cannot handle strings longer than 19 ch=
ars */
 	        strcpy(myhostad, adhostoverride);
-		free(adhostoverride);
 	} else {
 	        strcpy(myhostad, myhostname);
 	        for (i =3D 0; myhostad[i] !=3D 0; ++i) {
@@ -836,6 +835,8 @@ find_keytab_entry(krb5_context context, krb5_keytab k=
t,
 	        myhostad[i] =3D '$';
 	        myhostad[i+1] =3D 0;
 	}
+	if (adhostoverride)
+		krb5_free_string(context, adhostoverride);
=20
 	if (!srchost) {
 		retval =3D get_full_hostname(myhostname, myhostname, sizeof(myhostname=
));
--=20
2.24.1