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;
Subject: Re: [PATCH] gssd: Closed a memory leak in find_keytab_entry()
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <20200212190515.7443-1-steved@redhat.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <a256db55-1d40-bf4a-a131-4bdac4bf37f7@RedHat.com>
Date:   Fri, 14 Feb 2020 16:41:16 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <20200212190515.7443-1-steved@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


On 2/12/20 2:05 PM, Steve Dickson wrote:
> When 'adhostoverride' is "not set", which
> is most of the time, adhostoverride is not freed.
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... 

stesved
> ---
>  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 kt,
>  	int tried_all = 0, tried_default = 0, tried_upper = 0;
>  	krb5_principal princ;
>  	const char *notsetstr = "not set";
> -	char *adhostoverride;
> +	char *adhostoverride = NULL;
>  
>  
>  	/* Get full target hostname */
> @@ -827,7 +827,6 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
>  				adhostoverride);
>  	        /* No overflow: Windows cannot handle strings longer than 19 chars */
>  	        strcpy(myhostad, adhostoverride);
> -		free(adhostoverride);
>  	} else {
>  	        strcpy(myhostad, myhostname);
>  	        for (i = 0; myhostad[i] != 0; ++i) {
> @@ -836,6 +835,8 @@ find_keytab_entry(krb5_context context, krb5_keytab kt,
>  	        myhostad[i] = '$';
>  	        myhostad[i+1] = 0;
>  	}
> +	if (adhostoverride)
> +		krb5_free_string(context, adhostoverride);
>  
>  	if (!srchost) {
>  		retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
>