From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: Re: [PATCH 22/28] mini-os: fix various memory leaks in
	blkfront
Date: Wed, 18 Sep 2013 13:47:58 +0200
Message-ID: <20130918114758.GO5664@type.bordeaux.inria.fr>
References: <1379475484-25993-1-git-send-email-mattjd@gmail.com>
	<1379475484-25993-23-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-23-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:37:58 +1200, a =E9crit :
> Coverity-ID: 1055814
> Coverity-ID: 1055815
> Signed-off-by: Matthew Daley <mattjd@gmail.com>

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

> ---
>  extras/mini-os/blkfront.c |   11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> =

> diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c
> index ddcf665..aead6bd 100644
> --- a/extras/mini-os/blkfront.c
> +++ b/extras/mini-os/blkfront.c
> @@ -250,7 +250,7 @@ error:
>  =

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

>      char path[strlen(dev->backend) + strlen("/state") + 1];
> @@ -295,12 +295,15 @@ void shutdown_blkfront(struct blkfront_dev *dev)
>  =

>  close:
>      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/ring-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_blkfront(dev);
> -- =

> 1.7.10.4
> =


-- =

Samuel
<b> il faut combien de chevaux pour tirer une dolor=E9an =E0 88 morph ?
***b vient de remarque que 88 mph c'est 142 km/h
<y> aaaaah
<y> c'est pour =E7a qu'ils limitent =E0 130 km/h sur les autoroutes
<y> c'est pour =E9viter que les gens voyagent dans le temps
<b> probablement