From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH for-4.6 10/13] xl: valid fd can be 0 in
	main_loadpolicy
Date: Thu, 23 Jul 2015 10:48:50 +0100
Message-ID: <1437644930.19412.82.camel@citrix.com>
References: <1437638354-14216-1-git-send-email-wei.liu2@citrix.com>
	<1437638354-14216-11-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=639e45c83=Ian.Campbell@citrix.com>)
	id 1ZID7Y-0001Uf-C3
	for xen-devel@lists.xenproject.org; Thu, 23 Jul 2015 09:48:56 +0000
In-Reply-To: <1437638354-14216-11-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>, Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Thu, 2015-07-23 at 08:59 +0100, Wei Liu wrote:
> Also fixed some style problems while I was there.

polFd is initialised to 0, I think it should be initialised to -1 as
well as your change here, otherwise you can unexpectedly close stdin on
some error paths.

(also: studly caps, yuk, not your fault I expect)

> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
>  tools/libxl/xl_cmdimpl.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> index 7e279cd..3717568 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -7856,7 +7856,7 @@ int main_loadpolicy(int argc, char **argv)
>  
>      polFName = argv[optind];
>      polFd = open(polFName, O_RDONLY);
> -    if ( polFd < 0 ) {
> +    if (polFd < 0) {
>          fprintf(stderr, "Error occurred opening policy file '%s': 
> %s\n",
>                  polFName, strerror(errno));
>          ret = -1;
> @@ -7864,7 +7864,7 @@ int main_loadpolicy(int argc, char **argv)
>      }
>  
>      ret = stat(polFName, &info);
> -    if ( ret < 0 ) {
> +    if (ret < 0) {
>          fprintf(stderr, "Error occurred retrieving information 
> about"
>                  "policy file '%s': %s\n", polFName, 
> strerror(errno));
>          goto done;
> @@ -7896,7 +7896,7 @@ int main_loadpolicy(int argc, char **argv)
>  
>  done:
>      free(polMemCp);
> -    if ( polFd > 0 )
> +    if (polFd >= 0)
>          close(polFd);
>  
>      return ret;