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] nfs-utils: Fix memory leak on error in
 nfs-server-generator
To:     Alice J Mitchell <ajmitchell@redhat.com>, linux-nfs@vger.kernel.org
References: <1564657141.8625.7.camel@redhat.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <3543e83f-f79b-2683-6249-4a8c22857852@RedHat.com>
Date:   Thu, 1 Aug 2019 12:20:47 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
MIME-Version: 1.0
In-Reply-To: <1564657141.8625.7.camel@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 8/1/19 6:59 AM, Alice J Mitchell wrote:
> Fix the trivial memory leak in the error handling of nfs-server-generator
> 
> Signed-off-by: Alice J Mitchell <ajmitchell@redhat.com>
Committed... 

steved.
> ---
>  systemd/nfs-server-generator.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/systemd/nfs-server-generator.c b/systemd/nfs-server-generator.c
> index 737f109..eec98fd 100644
> --- a/systemd/nfs-server-generator.c
> +++ b/systemd/nfs-server-generator.c
> @@ -25,6 +25,7 @@
>  #include <ctype.h>
>  #include <stdio.h>
>  #include <mntent.h>
> +#include <alloca.h>
>  
>  #include "misc.h"
>  #include "nfslib.h"
> @@ -98,7 +99,7 @@ int main(int argc, char *argv[])
>  		exit(1);
>  	}
>  
> -	path = malloc(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
> +	path = alloca(strlen(argv[1]) + sizeof(dirbase) + sizeof(filebase));
>  	if (!path)
>  		exit(2);
>  	if (export_read(_PATH_EXPORTS, 1) +
>