From 9e0f5b64f30c2f841f297e25c2f3a6d82c8a16b8 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Mon, 27 Jan 2020 19:01:57 +0100 Subject: [PATCH 086/116] virtiofsd: fix memory leak on lo.source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Dr. David Alan Gilbert Message-id: <20200127190227.40942-83-dgilbert@redhat.com> Patchwork-id: 93536 O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 082/112] virtiofsd: fix memory leak on lo.source Bugzilla: 1694164 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Sergio Lopez Pascual From: Liu Bo valgrind reported that lo.source is leaked on quiting, but it was defined as (const char*) as it may point to a const string "/". Signed-off-by: Liu Bo Reviewed-by: Misono Tomohiro Signed-off-by: Dr. David Alan Gilbert (cherry picked from commit eb68a33b5fc5dde87bd9b99b94e7c33a5d8ea82e) Signed-off-by: Miroslav Rezanina --- tools/virtiofsd/passthrough_ll.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index af050c6..056ebe8 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -115,7 +115,7 @@ struct lo_data { int writeback; int flock; int xattr; - const char *source; + char *source; double timeout; int cache; int timeout_set; @@ -2497,9 +2497,8 @@ int main(int argc, char *argv[]) fuse_log(FUSE_LOG_ERR, "source is not a directory\n"); exit(1); } - } else { - lo.source = "/"; + lo.source = strdup("/"); } if (!lo.timeout_set) { switch (lo.cache) { @@ -2570,5 +2569,7 @@ err_out1: close(lo.root.fd); } + free(lo.source); + return ret ? 1 : 0; } -- 1.8.3.1