Re: [Xen-devel] [PATCH 1/3] xl: free config_data on error in domain_create

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Fri, 2016-02-19 at 16:02 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH 1/3] xl: free config_data on error in
> domain_create"):
> > CID: 1055898
> ...
> > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> > index d5a397a..e819ee6 100644
> > --- a/tools/libxl/xl_cmdimpl.c
> > +++ b/tools/libxl/xl_cmdimpl.c
> > @@ -2795,6 +2795,7 @@ static uint32_t create_domain(struct
> > domain_create *dom_info)
> > ÂÂÂÂÂÂÂÂÂif (!restoring && extra_config && strlen(extra_config)) {
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂif (config_len > INT_MAX - (strlen(extra_config) + 2 + 1))
> > {
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfprintf(stderr, "Failed to attach extra
> > configuration\n");
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfree(config_data);
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂreturn ERROR_FAIL;
> 
> This LGTM.
> 
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂ/* allocate space for the extra config plus two EOLs plus
> > \0 */
> > @@ -6525,6 +6526,7 @@ int main_networkattach(int argc, char **argv)
> > ÂÂÂÂÂ}
> > Â
> > ÂÂÂÂÂxlu_cfg_destroy(config);
> > +ÂÂÂÂconfig = NULL;
> > Â
> > ÂÂÂÂÂif (argc > 0) return 1; /* Parse error above */
> 
> But this doesn't apply and the current code in main_networkattach
> doesn't seem to have a bug that something this would fix.

Looks like a stray line which should have been in "xl: network-attach: free
config object after use", sorry.

I'll wait for you to push the batch you have in hand and then rebase fixing
this as I go.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel