From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: Re: [PATCH] init-xenstore-domain: cleanup all resources
 on a single exit path
Date: Thu, 11 Feb 2016 11:27:37 +0000
Message-ID: <20160211112737.GG17384@citrix.com>
References: <1455123382-25942-1-git-send-email-ian.campbell@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>
Content-Disposition: inline
In-Reply-To: <1455123382-25942-1-git-send-email-ian.campbell@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: Ian Campbell <ian.campbell@citrix.com>
Cc: wei.liu2@citrix.com, Daniel De Graaf <dgdegra@tycho.nsa.gov>, ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On Wed, Feb 10, 2016 at 04:56:22PM +0000, Ian Campbell wrote:
> Previously xs_fd would be left open, which is CID 1055993 (previously
> partially fixed by 3bca826aae5eb).
> 
> Instead arrange for both success and error cases to cleanup everything
> on a single exit path instead of doing partial cleanup on the success
> path a few operations higher up.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

> ---
>  tools/helpers/init-xenstore-domain.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
> index 5c5af2d..909542b 100644
> --- a/tools/helpers/init-xenstore-domain.c
> +++ b/tools/helpers/init-xenstore-domain.c
> @@ -172,9 +172,6 @@ static int build(xc_interface *xch)
>          goto err;
>      }
>  
> -    xc_dom_release(dom);
> -    dom = NULL;
> -
>      rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC);
>      if ( rv )
>      {
> @@ -188,14 +185,18 @@ static int build(xc_interface *xch)
>          goto err;
>      }
>  
> -    return 0;
> +    rv = 0;
>  
>  err:
>      if ( dom )
>          xc_dom_release(dom);
> -    if ( domid != ~0 )
> +    if ( xs_fd >= 0 )
> +        close(xs_fd);
> +
> +    /* if we failed then destroy the domain */
> +    if ( rv && domid != ~0 )
>          xc_domain_destroy(xch, domid);
> -    close(xs_fd);
> +
>      return rv;
>  }
>  
> -- 
> 2.1.4
>