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 the error handling if the lseek fails
To:     Alice J Mitchell <ajmitchell@redhat.com>, linux-nfs@vger.kernel.org
References: <1564666361.8625.10.camel@redhat.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <76b68650-1a20-4fb0-6972-f0780d4b82f6@RedHat.com>
Date:   Thu, 1 Aug 2019 12:21:18 -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: <1564666361.8625.10.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 9:32 AM, Alice J Mitchell wrote:
> The error case when lseek returns a negative value was not correctly handled,
> and the error cleanup routine was potentially leaking memory also.
> 
> Signed-off-by: Alice J Mitchell <ajmitchell@redhat.com>
Committed... 

steved.

> ---
>  support/nfs/conffile.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index b6400be..6ba8a35 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -500,7 +500,7 @@ conf_readfile(const char *path)
>  
>  	if ((stat (path, &sb) == 0) || (errno != ENOENT)) {
>  		char *new_conf_addr = NULL;
> -		size_t sz = sb.st_size;
> +		off_t sz;
>  		int fd = open (path, O_RDONLY, 0);
>  
>  		if (fd == -1) {
> @@ -517,6 +517,11 @@ conf_readfile(const char *path)
>  
>  		/* only after we have the lock, check the file size ready to read it */
>  		sz = lseek(fd, 0, SEEK_END);
> +		if (sz < 0) {
> +			xlog_warn("conf_readfile: unable to determine file size: %s",
> +				  strerror(errno));
> +			goto fail;
> +		}
>  		lseek(fd, 0, SEEK_SET);
>  
>  		new_conf_addr = malloc(sz+1);
> @@ -2162,6 +2167,7 @@ conf_write(const char *filename, const char *section, const char *arg,
>  	ret = 0;
>  
>  cleanup:
> +	flush_outqueue(&inqueue, NULL);
>  	flush_outqueue(&outqueue, NULL);
>  
>  	if (buff)
>