All of lore.kernel.org
 help / color / mirror / Atom feed
* [Virtio-fs] [PATCH] Virtiofsd: fix memory leak on fuse queueinfo
@ 2019-06-24 21:53 Liu Bo
  2019-06-25 18:42 ` Dr. David Alan Gilbert
  0 siblings, 1 reply; 2+ messages in thread
From: Liu Bo @ 2019-06-24 21:53 UTC (permalink / raw)
  To: virtio-fs

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 <bo.liu@linux.alibaba.com>
---
 contrib/virtiofsd/fuse_virtio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virtio.c
index bec4105..aa94b66 100644
--- a/contrib/virtiofsd/fuse_virtio.c
+++ b/contrib/virtiofsd/fuse_virtio.c
@@ -763,6 +763,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;
         }
 }
 
@@ -889,6 +891,7 @@ int virtio_session_mount(struct fuse_session *se)
 void virtio_session_close(struct fuse_session *se)
 {
         close(se->vu_socketfd);
+        free(se->virtio_dev->qi);
         free(se->virtio_dev);
         se->virtio_dev = NULL;
 }
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Virtio-fs] [PATCH] Virtiofsd: fix memory leak on fuse queueinfo
  2019-06-24 21:53 [Virtio-fs] [PATCH] Virtiofsd: fix memory leak on fuse queueinfo Liu Bo
@ 2019-06-25 18:42 ` Dr. David Alan Gilbert
  0 siblings, 0 replies; 2+ messages in thread
From: Dr. David Alan Gilbert @ 2019-06-25 18:42 UTC (permalink / raw)
  To: Liu Bo; +Cc: virtio-fs

* Liu Bo (bo.liu@linux.alibaba.com) wrote:
> 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 <bo.liu@linux.alibaba.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  contrib/virtiofsd/fuse_virtio.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virtio.c
> index bec4105..aa94b66 100644
> --- a/contrib/virtiofsd/fuse_virtio.c
> +++ b/contrib/virtiofsd/fuse_virtio.c
> @@ -763,6 +763,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;
>          }
>  }
>  
> @@ -889,6 +891,7 @@ int virtio_session_mount(struct fuse_session *se)
>  void virtio_session_close(struct fuse_session *se)
>  {
>          close(se->vu_socketfd);
> +        free(se->virtio_dev->qi);
>          free(se->virtio_dev);
>          se->virtio_dev = NULL;
>  }
> -- 
> 1.8.3.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-06-25 18:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-24 21:53 [Virtio-fs] [PATCH] Virtiofsd: fix memory leak on fuse queueinfo Liu Bo
2019-06-25 18:42 ` Dr. David Alan Gilbert

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.