Re: [PATCH 084/104] Virtiofsd: fix memory leak on fuse queueinfo

[Dr. David Alan Gilbert]

* Misono Tomohiro (address@hidden) wrote:
> > From: Liu Bo <address@hidden>
> > 
> > For fuse's queueinfo, both queueinfo array and queueinfos are allocated in
> > fv_queue_set_started() but not cleaned up when the daemon process quits.
> > 
> > This fixes the leak in proper places.
> > 
> > Signed-off-by: Liu Bo <address@hidden>
> > Signed-off-by: Eric Ren <address@hidden>
> > ---
> >  tools/virtiofsd/fuse_virtio.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> > 
> > diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
> > index 7b22ae8d4f..a364f23d5d 100644
> > --- a/tools/virtiofsd/fuse_virtio.c
> > +++ b/tools/virtiofsd/fuse_virtio.c
> > @@ -671,6 +671,8 @@ static void fv_queue_set_started(VuDev *dev, int qidx, 
> > bool started)
> >          }
> >          close(ourqi->kill_fd);
> >          ourqi->kick_fd = -1;
> > +        free(vud->qi[qidx]);
> > +        vud->qi[qidx] = NULL;
> >      }
> >  }
> >  
> > @@ -878,6 +880,13 @@ int virtio_session_mount(struct fuse_session *se)
> >  void virtio_session_close(struct fuse_session *se)
> >  {
> >      close(se->vu_socketfd);
> 
> I beleve above close() should be removed as it is called 6 line below.

You're right, I think that's my fault from when I merged this patch
with 'Virtiofsd: fix segfault when quit before dev init'.

Fixed.
Thanks.

Dave

> > +
> > +    if (!se->virtio_dev) {
> > +        return;
> > +    }
> > +
> > +    close(se->vu_socketfd);
> > +    free(se->virtio_dev->qi);
> >      free(se->virtio_dev);
> >      se->virtio_dev = NULL;
> >  }
> > -- 
> > 2.23.0
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK