All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Benoît Canet" <benoit.canet@irqsave.net>
To: Fam Zheng <famz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 1/4] nfs: Fix leak of opts in nfs_file_open
Date: Wed, 27 Aug 2014 16:46:53 +0200	[thread overview]
Message-ID: <20140827144652.GK31176@irqsave.net> (raw)
In-Reply-To: <1409119356-22742-2-git-send-email-famz@redhat.com>

The Wednesday 27 Aug 2014 à 14:02:33 (+0800), Fam Zheng wrote :
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/nfs.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/block/nfs.c b/block/nfs.c
> index 93d87f3..36e8057 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -393,15 +393,18 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,
>      qemu_opts_absorb_qdict(opts, options, &local_err);
>      if (local_err) {
>          error_propagate(errp, local_err);
> -        return -EINVAL;
> +        ret = -EINVAL;

1)

Here you put the return code in ret and goto out.

> +        goto out;
>      }
>      ret = nfs_client_open(client, qemu_opt_get(opts, "filename"),
>                            (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
>                            errp);
>      if (ret < 0) {
> -        return ret;
> +        goto out;

2) here you seem to want to do something later with the value of ret.

>      }
>      bs->total_sectors = ret;
> +out:
> +    qemu_opts_del(opts);

>      return 0;

Here the code simply return 0 discarding the return code you set in 1) and 2).

>  }
>  
> -- 
> 2.1.0
> 
> 

  reply	other threads:[~2014-08-27 14:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-27  6:02 [Qemu-devel] [PATCH 0/4] block: Fix leaks of opts in block drivers Fam Zheng
2014-08-27  6:02 ` [Qemu-devel] [PATCH 1/4] nfs: Fix leak of opts in nfs_file_open Fam Zheng
2014-08-27 14:46   ` Benoît Canet [this message]
2014-08-28  4:07     ` Fam Zheng
2014-08-27  6:02 ` [Qemu-devel] [PATCH 2/4] blkverify: Fix leak of opts in blkverify_open Fam Zheng
2014-08-27 14:41   ` Benoît Canet
2014-08-27  6:02 ` [Qemu-devel] [PATCH 3/4] quorum: Fix leak of opts in quorum_open Fam Zheng
2014-08-27 14:36   ` Benoît Canet
2014-08-27  6:02 ` [Qemu-devel] [PATCH 4/4] qcow2: Fix leak of opts in qcow2_open Fam Zheng
2014-08-27 14:40   ` Benoît Canet
2014-08-28  4:04     ` Fam Zheng
2014-08-27 17:40   ` Max Reitz
2014-08-28  4:06     ` Fam Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140827144652.GK31176@irqsave.net \
    --to=benoit.canet@irqsave.net \
    --cc=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.