On Tue, Aug 02, 2022 at 02:07:04PM +0200, Laurent Vivier wrote:
> On 02/08/2022 13:24, Eugenio Pérez wrote:
> > File descriptor vdpa_device_fd is not free in the case of returning
> > error from vhost_vdpa_get_features. Fixing it by making all errors go to
> > the same error path.
> >
> > Resolves: Coverity CID 1490785
> > Fixes: 8170ab3f43 ("vdpa: Extract get features part from
> > vhost_vdpa_get_max_queue_pairs")
> >
> > Signed-off-by: Eugenio Pérez <epere...@redhat.com>
> > ---
> > net/vhost-vdpa.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> > index 6abad276a6..303447a68e 100644
> > --- a/net/vhost-vdpa.c
> > +++ b/net/vhost-vdpa.c
> > @@ -566,7 +566,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const
> > char *name,
> > g_autofree NetClientState **ncs = NULL;
> > g_autoptr(VhostIOVATree) iova_tree = NULL;
> > NetClientState *nc;
> > - int queue_pairs, r, i, has_cvq = 0;
> > + int queue_pairs, r, i = 0, has_cvq = 0;
> > assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
> > opts = &netdev->u.vhost_vdpa;
> > @@ -582,7 +582,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const
> > char *name,
> > r = vhost_vdpa_get_features(vdpa_device_fd, &features, errp);
> > if (unlikely(r < 0)) {
> > - return r;
> > + goto err;
> > }
> > queue_pairs = vhost_vdpa_get_max_queue_pairs(vdpa_device_fd, features,
>
> Reviewed-by: Laurent Vivier <lviv...@redhat.com>
>
> I can take this one via the trivial branch.
>
> Thanks,
> Laurent
Not sure why it's appropriate for trivial but sure if you like
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
