From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <nhorman@tuxdriver.com>
Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58])
 by dpdk.org (Postfix) with ESMTP id 45CE57CEF
 for <dev@dpdk.org>; Fri,  2 Feb 2018 13:45:24 +0100 (CET)
Received: from cpe-2606-a000-111b-4011-eaa3-4b92-4a68-8f24.dyn6.twc.com
 ([2606:a000:111b:4011:eaa3:4b92:4a68:8f24] helo=localhost)
 by smtp.tuxdriver.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63)
 (envelope-from <nhorman@tuxdriver.com>)
 id 1ehaiN-0003Jc-9W; Fri, 02 Feb 2018 07:45:18 -0500
Date: Fri, 2 Feb 2018 07:44:39 -0500
From: Neil Horman <nhorman@tuxdriver.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: dev@dpdk.org
Message-ID: <20180202124439.GB21773@hmswarspite.think-freely.org>
References: <20180202120058.243184-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180202120058.243184-1-bruce.richardson@intel.com>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-Spam-Score: -2.9 (--)
X-Spam-Status: No
Subject: Re: [dpdk-dev] [PATCH] pmdinfogen: fix resource leak of FILE object
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Feb 2018 12:45:24 -0000

On Fri, Feb 02, 2018 at 12:00:58PM +0000, Bruce Richardson wrote:
> Coverity flags an issue where the resources used by the FILE object for
> the temporary input file are leaked. This is a very minor issue, but is
> easily fixed, while also avoiding later problems where we try to close
> an invalid file descriptor in the failure case.
> 
> The fix is to use "dup()" to get a new file descriptor number rather than
> using the value directly from fileno. This allows us to close the file
> opened with tmpfile() within in scope block, while allowing the duplicate
> to pass to the outer block and be closed when the function terminates.
> 
> As a side-effect I/O in the function is therefore changed from using stdio
> fread/fwrite to read/write system calls.
> 
> Coverity issue: 260399
> Fixes: 0d68533617e3 ("pmdinfogen: allow using stdin and stdout")
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  buildtools/pmdinfogen/pmdinfogen.c | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/buildtools/pmdinfogen/pmdinfogen.c b/buildtools/pmdinfogen/pmdinfogen.c
> index 45b267346..0f35ca46b 100644
> --- a/buildtools/pmdinfogen/pmdinfogen.c
> +++ b/buildtools/pmdinfogen/pmdinfogen.c
> @@ -50,20 +50,24 @@ static void *grab_file(const char *filename, unsigned long *size)
>  		/* from stdin, use a temporary file to mmap */
>  		FILE *infile;
>  		char buffer[1024];
> -		size_t n;
> +		int n;
>  
>  		infile = tmpfile();
>  		if (infile == NULL) {
>  			perror("tmpfile");
>  			return NULL;
>  		}
> -		while (!feof(stdin)) {
> -			n = fread(buffer, 1, sizeof(buffer), stdin);
> -			if (fwrite(buffer, 1, n, infile) != n)
> +		fd = dup(fileno(infile));
> +		fclose(infile);
> +		if (fd < 0)
> +			return NULL;
> +
> +		n = read(STDIN_FILENO, buffer, sizeof(buffer));
> +		while (n > 0) {
> +			if (write(fd, buffer, n) != n)
>  				goto failed;
> +			n = read(STDIN_FILENO, buffer, sizeof(buffer));
>  		}
> -		fflush(infile);
> -		fd = fileno(infile);
>  	}
>  
>  	if (fstat(fd, &st))
> -- 
> 2.14.3
> 
> 

Wouldn't it be just as good, and easier to check fd for == -1 as a condition of
calling close?

like 
failed:
	if (fd >= 0)
		close(fd);