From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Re: [PATCH 25/28] mini-os: fix various memory leaks in
	pcifront
Date: Wed, 18 Sep 2013 13:51:34 +0200
Message-ID: <20130918115134.GR5664@type.bordeaux.inria.fr>
References: <1379475484-25993-1-git-send-email-mattjd@gmail.com>
	<1379475484-25993-26-git-send-email-mattjd@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <1379475484-25993-26-git-send-email-mattjd@gmail.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: Matthew Daley <mattjd@gmail.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

Matthew Daley, le Wed 18 Sep 2013 15:38:01 +1200, a =E9crit :
> Coverity-ID: 1055834-1055840
> Signed-off-by: Matthew Daley <mattjd@gmail.com>

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  extras/mini-os/pcifront.c |   29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
> =

> diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c
> index cdf9c9b..7838021 100644
> --- a/extras/mini-os/pcifront.c
> +++ b/extras/mini-os/pcifront.c
> @@ -122,11 +122,12 @@ void pcifront_watches(void *opaque)
>              } else if (state =3D=3D XenbusStateClosing)
>                  break;
>          }
> -        if (err)
> +        if (err) {
>              printk("pcifront_watches: done waiting err=3D%s\n", err);
> -        else
> +            free(err);
> +        } else
>              printk("pcifront_watches: done waiting\n");
> -        xenbus_unwatch_path_token(XBT_NIL, be_state, be_state);
> +        err =3D xenbus_unwatch_path_token(XBT_NIL, be_state, be_state);
>          shutdown_pcifront(pcidev);
>          free(be_state);
>          free(be_path);
> @@ -143,7 +144,7 @@ struct pcifront_dev *init_pcifront(char *_nodename)
>      char* err;
>      char* message=3DNULL;
>      int retry=3D0;
> -    char* msg;
> +    char* msg =3D NULL;
>      char* nodename =3D _nodename ? _nodename : "device/pci/0";
>      int dom;
>  =

> @@ -250,7 +251,8 @@ done:
>              err =3D xenbus_wait_for_state_change(path, &state, &dev->eve=
nts);
>          if (state !=3D XenbusStateConnected) {
>              printk("backend not avalable, state=3D%d\n", state);
> -            xenbus_unwatch_path_token(XBT_NIL, path, path);
> +            if (err) free(err);
> +            err =3D xenbus_unwatch_path_token(XBT_NIL, path, path);
>              goto error;
>          }
>  =

> @@ -258,7 +260,8 @@ done:
>          if ((err =3D xenbus_switch_state(XBT_NIL, frontpath, XenbusState=
Connected))
>              !=3D NULL) {
>              printk("error switching state %s\n", err);
> -            xenbus_unwatch_path_token(XBT_NIL, path, path);
> +            free(err);
> +            err =3D xenbus_unwatch_path_token(XBT_NIL, path, path);
>              goto error;
>          }
>      }
> @@ -272,6 +275,7 @@ done:
>      return dev;
>  =

>  error:
> +    free(msg);
>      free(err);
>      free_pcifront(dev);
>      return NULL;
> @@ -301,6 +305,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*f=
unc)(unsigned int domain, u
>          msg =3D xenbus_read(XBT_NIL, path, &s);
>          if (msg) {
>              printk("Error %s when reading the PCI root name at %s\n", ms=
g, path);
> +            free(msg);
>              continue;
>          }
>  =

> @@ -319,7 +324,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*f=
unc)(unsigned int domain, u
>  =

>  void shutdown_pcifront(struct pcifront_dev *dev)
>  {
> -    char* err =3D NULL;
> +    char* err =3D NULL, *err2;
>      XenbusState state;
>  =

>      char path[strlen(dev->backend) + strlen("/state") + 1];
> @@ -361,12 +366,15 @@ void shutdown_pcifront(struct pcifront_dev *dev)
>  =

>  close_pcifront:
>      if (err) free(err);
> -    xenbus_unwatch_path_token(XBT_NIL, path, path);
> +    err2 =3D xenbus_unwatch_path_token(XBT_NIL, path, path);
> +    if (err2) free(err2);
>  =

>      snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename);
> -    xenbus_rm(XBT_NIL, nodename);
> +    err2 =3D xenbus_rm(XBT_NIL, nodename);
> +    if (err2) free(err2);
>      snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodena=
me);
> -    xenbus_rm(XBT_NIL, nodename);
> +    err2 =3D xenbus_rm(XBT_NIL, nodename);
> +    if (err2) free(err2);
>  =

>      if (!err)
>          free_pcifront(dev);
> @@ -397,6 +405,7 @@ int pcifront_physical_to_virtual (struct pcifront_dev=
 *dev,
>          msg =3D xenbus_read(XBT_NIL, path, &s);
>          if (msg) {
>              printk("Error %s when reading the PCI root name at %s\n", ms=
g, path);
> +            free(msg);
>              continue;
>          }
>  =

> -- =

> 1.7.10.4
> =


-- =

Samuel
<c> ya(ka|ma|to)* ca existe une fois sur 2 au japon, c'est facile ;-)
 -+- #ens-mim au japon -+-