|
 |
22c213 |
From 3b6461ee08654b2cbb6d4e0cc15c02f89a6610d5 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
Date: Tue, 3 Mar 2020 18:43:09 +0000
|
|
|
22c213 |
Subject: [PATCH 13/18] virtiofsd: fv_create_listen_socket error path socket
|
|
|
22c213 |
leak
|
|
|
22c213 |
MIME-Version: 1.0
|
|
|
22c213 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c213 |
Content-Transfer-Encoding: 8bit
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Message-id: <20200303184314.155564-3-dgilbert@redhat.com>
|
|
|
22c213 |
Patchwork-id: 94124
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/7] virtiofsd: fv_create_listen_socket error path socket leak
|
|
|
22c213 |
Bugzilla: 1797064
|
|
|
22c213 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Ján Tomko <jtomko@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
If we fail when bringing up the socket we can leak the listen_fd;
|
|
|
22c213 |
in practice the daemon will exit so it's not really a problem.
|
|
|
22c213 |
|
|
|
22c213 |
Fixes: Coverity CID 1413121
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
(cherry picked from commit 6fa249027f97e3080f3d9c0fab3f94f8f80828fe)
|
|
|
22c213 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
tools/virtiofsd/fuse_virtio.c | 2 ++
|
|
|
22c213 |
1 file changed, 2 insertions(+)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
|
|
|
22c213 |
index 80a6e92..dd1c605 100644
|
|
|
22c213 |
--- a/tools/virtiofsd/fuse_virtio.c
|
|
|
22c213 |
+++ b/tools/virtiofsd/fuse_virtio.c
|
|
|
22c213 |
@@ -916,6 +916,7 @@ static int fv_create_listen_socket(struct fuse_session *se)
|
|
|
22c213 |
old_umask = umask(0077);
|
|
|
22c213 |
if (bind(listen_sock, (struct sockaddr *)&un, addr_len) == -1) {
|
|
|
22c213 |
fuse_log(FUSE_LOG_ERR, "vhost socket bind: %m\n");
|
|
|
22c213 |
+ close(listen_sock);
|
|
|
22c213 |
umask(old_umask);
|
|
|
22c213 |
return -1;
|
|
|
22c213 |
}
|
|
|
22c213 |
@@ -923,6 +924,7 @@ static int fv_create_listen_socket(struct fuse_session *se)
|
|
|
22c213 |
|
|
|
22c213 |
if (listen(listen_sock, 1) == -1) {
|
|
|
22c213 |
fuse_log(FUSE_LOG_ERR, "vhost socket listen: %m\n");
|
|
|
22c213 |
+ close(listen_sock);
|
|
|
22c213 |
return -1;
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|