From: Jason Wang <jasowang@redhat.com>
To: Stefano Garzarella <sgarzare@redhat.com>
Cc: Cindy Lu <lulu@redhat.com>, mst <mst@redhat.com>,
qemu-devel <qemu-devel@nongnu.org>,
eperezma <eperezma@redhat.com>, Eli Cohen <elic@nvidia.com>,
Zhu Lingshan <lingshan.zhu@intel.com>
Subject: Re: [PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add()
Date: Tue, 6 Jul 2021 16:28:50 +0800 [thread overview]
Message-ID: <CACGkMEuTEatgLSKXVysghtcJq3NHiZnP=GmU=sAwNoY99hYUpw@mail.gmail.com> (raw)
In-Reply-To: <20210706082703.julcfywtatytczbo@steredhat>
On Tue, Jul 6, 2021 at 4:27 PM Stefano Garzarella <sgarzare@redhat.com> wrote:
>
> On Tue, Jul 06, 2021 at 04:10:22PM +0800, Jason Wang wrote:
> >
> >在 2021/7/6 下午4:03, Jason Wang 写道:
> >>
> >>在 2021/6/23 下午11:03, Stefano Garzarella 写道:
> >>>On Mon, Jun 21, 2021 at 12:16:39PM +0800, Jason Wang wrote:
> >>>>Introduce new error label to avoid the unnecessary checking of net
> >>>>pointer.
> >>>>
> >>>>Fixes: 1e0a84ea49b68 ("vhost-vdpa: introduce vhost-vdpa net client")
> >>>>Signed-off-by: Jason Wang <jasowang@redhat.com>
> >>>>---
> >>>>net/vhost-vdpa.c | 13 ++++++-------
> >>>>1 file changed, 6 insertions(+), 7 deletions(-)
> >>>>
> >>>>diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> >>>>index 21f09c546f..0da7bc347a 100644
> >>>>--- a/net/vhost-vdpa.c
> >>>>+++ b/net/vhost-vdpa.c
> >>>>@@ -100,19 +100,18 @@ static int vhost_vdpa_add(NetClientState
> >>>>*ncs, void *be)
> >>>> net = vhost_net_init(&options);
> >>>> if (!net) {
> >>>> error_report("failed to init vhost_net for queue");
> >>>>- goto err;
> >>>>+ goto err_init;
> >>>> }
> >>>> s->vhost_net = net;
> >>>> ret = vhost_vdpa_net_check_device_id(net);
> >>>> if (ret) {
> >>>>- goto err;
> >>>>+ goto err_check;
> >>>> }
> >>>> return 0;
> >>>>-err:
> >>>>- if (net) {
> >>>>- vhost_net_cleanup(net);
> >>>>- g_free(net);
> >>>>- }
> >>>>+err_check:
> >>>>+ vhost_net_cleanup(net);
> >>>>+ g_free(net);
> >>>
> >>>Should we set s->vhost_net to NULL to avoid use after free?
> >>>
> >>>Then we should also remove the `assert(s->vhost_net)` in
> >>>net_vhost_vdpa_init() since we can fail.
> >>
> >>
> >>Right, will do this in a separate patch.
> >
> >
> >I just forget the job has been done in the next patch :)
>
> I saw it later too ;-)
>
> >
> >So we are fine here.
>
> Yep for the assert(), but what about setting s->vhost_net to NULL?
> Or just move the s->vhost_net assignment just before the `return 0`.
We can do, I've posted V2. If it has comment, I will do that in V3.
Otherwise I will send a separate patch for this.
Thanks
>
> Thanks,
> Stefano
>
next prev parent reply other threads:[~2021-07-06 8:43 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 4:16 [PATCH 00/18] vhost-vDPA multiqueue Jason Wang
2021-06-21 4:16 ` [PATCH 01/18] vhost_net: remove the meaningless assignment in vhost_net_start_one() Jason Wang
2021-06-21 11:45 ` Eli Cohen
2021-06-24 7:42 ` Jason Wang
2021-06-21 4:16 ` [PATCH 02/18] vhost: use unsigned int for nvqs Jason Wang
2021-06-21 11:46 ` Eli Cohen
2021-06-21 4:16 ` [PATCH 03/18] vhost_net: do not assume nvqs is always 2 Jason Wang
2021-06-23 14:49 ` Stefano Garzarella
2021-06-24 6:22 ` Eli Cohen
2021-06-24 7:42 ` Jason Wang
2021-06-21 4:16 ` [PATCH 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add() Jason Wang
2021-06-23 14:53 ` Stefano Garzarella
2021-06-24 6:38 ` Eli Cohen
2021-06-24 7:46 ` Jason Wang
2021-06-21 4:16 ` [PATCH 05/18] vhost-vdpa: don't cleanup twice " Jason Wang
2021-06-23 14:56 ` Stefano Garzarella
2021-06-21 4:16 ` [PATCH 06/18] vhost-vdpa: fix leaking of vhost_net " Jason Wang
2021-06-23 15:00 ` Stefano Garzarella
2021-06-24 7:06 ` Eli Cohen
2021-06-24 7:10 ` Jason Wang
2021-06-24 7:32 ` Eli Cohen
2021-06-24 7:14 ` Eli Cohen
2021-06-24 7:41 ` Jason Wang
2021-06-21 4:16 ` [PATCH 07/18] vhost-vdpa: tweak the error label " Jason Wang
2021-06-23 15:03 ` Stefano Garzarella
2021-07-06 8:03 ` Jason Wang
2021-07-06 8:10 ` Jason Wang
2021-07-06 8:27 ` Stefano Garzarella
2021-07-06 8:28 ` Jason Wang [this message]
2021-06-21 4:16 ` [PATCH 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init() Jason Wang
2021-06-23 15:04 ` Stefano Garzarella
2021-06-21 4:16 ` [PATCH 09/18] vhost-vdpa: remove the unncessary queue_index assignment Jason Wang
2021-06-23 15:05 ` Stefano Garzarella
2021-06-21 4:16 ` [PATCH 10/18] vhost-vdpa: open device fd in net_init_vhost_vdpa() Jason Wang
2021-06-23 15:07 ` Stefano Garzarella
2021-06-21 4:16 ` [PATCH 11/18] vhost-vdpa: classify one time request Jason Wang
2021-06-21 4:16 ` [PATCH 12/18] vhost-vdpa: prepare for the multiqueue support Jason Wang
2021-06-21 4:16 ` [PATCH 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * Jason Wang
2021-06-21 4:16 ` [PATCH 14/18] net: introduce control client Jason Wang
2021-06-21 4:16 ` [PATCH 15/18] vhost-net: control virtqueue support Jason Wang
2021-06-24 7:42 ` Eli Cohen
2021-06-24 7:44 ` Jason Wang
2021-06-30 17:33 ` Eugenio Perez Martin
2021-07-01 3:03 ` Jason Wang
2021-06-21 4:16 ` [PATCH 16/18] virito-net: use "qps" instead of "queues" when possible Jason Wang
2021-06-21 4:16 ` [PATCH 17/18] virtio-net: vhost control virtqueue support Jason Wang
2021-06-21 4:16 ` [PATCH 18/18] vhost-vdpa: multiqueue support Jason Wang
2021-07-01 6:51 ` Eugenio Perez Martin
2021-07-01 8:15 ` Jason Wang
2021-07-06 7:46 ` Jason Wang
2021-06-21 4:33 ` [PATCH 00/18] vhost-vDPA multiqueue no-reply
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='CACGkMEuTEatgLSKXVysghtcJq3NHiZnP=GmU=sAwNoY99hYUpw@mail.gmail.com' \
--to=jasowang@redhat.com \
--cc=elic@nvidia.com \
--cc=eperezma@redhat.com \
--cc=lingshan.zhu@intel.com \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@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 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).