From: Eric Blake <eblake@redhat.com>
To: pannengyuan@huawei.com, kwolf@redhat.com, mreitz@redhat.com,
sgarzare@redhat.com
Cc: liyiting@huawei.com, kuhn.chenqun@huawei.com,
qemu-devel@nongnu.org, qemu-block@nongnu.org,
zhang.zhanghailiang@huawei.com
Subject: Re: [PATCH V3 1/2] block/nbd: extract the common cleanup code
Date: Tue, 3 Dec 2019 13:00:16 -0600 [thread overview]
Message-ID: <c700a37d-d31d-f0e7-4edb-4872c4f0e5c2@redhat.com> (raw)
In-Reply-To: <1575012326-51324-1-git-send-email-pannengyuan@huawei.com>
On 11/29/19 1:25 AM, pannengyuan@huawei.com wrote:
> From: PanNengyuan <pannengyuan@huawei.com>
>
> The BDRVNBDState cleanup code is common in two places, add
> nbd_free_bdrvstate_prop() function to do these cleanups (suggested by
> Stefano Garzarella).
>
> Signed-off-by: PanNengyuan <pannengyuan@huawei.com>
> ---
> block/nbd.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/block/nbd.c b/block/nbd.c
> index 1239761..5805979 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -94,6 +94,8 @@ typedef struct BDRVNBDState {
>
> static int nbd_client_connect(BlockDriverState *bs, Error **errp);
>
> +static void nbd_free_bdrvstate_prop(BDRVNBDState *s);
> +
Why do you need a static function prototype? Just implement the
function prior to its first use, then you won't need a forward declaration.
> static void nbd_channel_error(BDRVNBDState *s, int ret)
> {
> if (ret == -EIO) {
> @@ -1486,6 +1488,15 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp)
> }
> }
>
> +static void nbd_free_bdrvstate_prop(BDRVNBDState *s)
> +{
> + object_unref(OBJECT(s->tlscreds));
> + qapi_free_SocketAddress(s->saddr);
> + g_free(s->export);
> + g_free(s->tlscredsid);
> + g_free(s->x_dirty_bitmap);
> +}
In fact, it appears that you did just that, as the first use...
Bike-shedding: the name 'nbd_free_bdrvstate_prop' doesn't seem right to
me - when I see a function with 'free' in the name taking a single
pointer, I assume that the given pointer (here, BDRVNBDState *s) is
freed - but your function does NOT free then incoming pointer. Rather,
you are clearing out the contents within a pre-allocated object which
remains allocated. What's more, since the object remains allocated, I'm
surprised that you are not setting fields to NULL to prevent
use-after-free bugs.
Either this function should also free s (in which case naming it merely
'nbd_free_bdrvstate' might be better), or you should consider naming it
'nbd_clear_bdrvstate' and assigning cleared fields to NULL.
> +
> /*
> * Parse nbd_open options
> */
> @@ -1855,10 +1866,7 @@ static int nbd_process_options(BlockDriverState *bs, QDict *options,
>
> error:
> if (ret < 0) {
> - object_unref(OBJECT(s->tlscreds));
> - qapi_free_SocketAddress(s->saddr);
> - g_free(s->export);
> - g_free(s->tlscredsid);
> + nbd_free_bdrvstate_prop(s);
...is here.
> }
> qemu_opts_del(opts);
> return ret;
> @@ -1937,12 +1945,7 @@ static void nbd_close(BlockDriverState *bs)
> BDRVNBDState *s = bs->opaque;
>
> nbd_client_close(bs);
> -
> - object_unref(OBJECT(s->tlscreds));
> - qapi_free_SocketAddress(s->saddr);
> - g_free(s->export);
> - g_free(s->tlscredsid);
> - g_free(s->x_dirty_bitmap);
> + nbd_free_bdrvstate_prop(s);
> }
>
> static int64_t nbd_getlength(BlockDriverState *bs)
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2019-12-03 19:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 7:25 [PATCH V3 1/2] block/nbd: extract the common cleanup code pannengyuan
2019-11-29 7:25 ` [PATCH V3 2/2] block/nbd: fix memory leak in nbd_open() pannengyuan
2019-12-03 17:52 ` for 4.2 ??? " Vladimir Sementsov-Ogievskiy
2019-12-03 18:54 ` Eric Blake
2019-12-03 21:59 ` Eric Blake
2019-12-04 3:30 ` pannengyuan
2019-12-03 17:38 ` [PATCH V3 1/2] block/nbd: extract the common cleanup code Vladimir Sementsov-Ogievskiy
2019-12-04 3:12 ` pannengyuan
2019-12-04 7:19 ` Vladimir Sementsov-Ogievskiy
2019-12-04 7:24 ` Pan Nengyuan
2019-12-03 19:00 ` Eric Blake [this message]
2019-12-04 3:20 ` pannengyuan
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=c700a37d-d31d-f0e7-4edb-4872c4f0e5c2@redhat.com \
--to=eblake@redhat.com \
--cc=kuhn.chenqun@huawei.com \
--cc=kwolf@redhat.com \
--cc=liyiting@huawei.com \
--cc=mreitz@redhat.com \
--cc=pannengyuan@huawei.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
--cc=zhang.zhanghailiang@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).