From 2544ab6ac5b788d2df319afaef8d495409aa7b32 Mon Sep 17 00:00:00 2001

Message-Id: <2544ab6ac5b788d2df319afaef8d495409aa7b32@dist-git>

From: Peter Krempa <pkrempa@redhat.com>

Date: Tue, 30 Jul 2019 16:04:51 +0200

Subject: [PATCH] util: command: Ignore bitmap errors when enumerating file

 descriptors to close

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

virCommandMassCloseGetFDsLinux fails when running libvird on valgrind

with the following message:

libvirt:  error : internal error: unable to set FD as open: 1024

This is because valgrind opens few file descriptors beyond the limit:

65701125 lr-x------. 1 root root 64 Jul 18 14:48 1024 -> /home/pipo/build/libvirt/gcc/src/.libs/libvirtd

65701126 lrwx------. 1 root root 64 Jul 18 14:48 1025 -> '/tmp/valgrind_proc_3849_cmdline_186612e3 (deleted)'

65701127 lrwx------. 1 root root 64 Jul 18 14:48 1026 -> '/tmp/valgrind_proc_3849_auxv_186612e3 (deleted)'

65701128 lrwx------. 1 root root 64 Jul 18 14:48 1027 -> /dev/pts/11

65701129 lr-x------. 1 root root 64 Jul 18 14:48 1028 -> 'pipe:[65689522]'

65701130 l-wx------. 1 root root 64 Jul 18 14:48 1029 -> 'pipe:[65689522]'

65701131 lr-x------. 1 root root 64 Jul 18 14:48 1030 -> /tmp/vgdb-pipe-from-vgdb-to-3849-by-root-on-angien

Ignore bitmap errors in this case since we'd leak those FD's anyways in

the previous scenario.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

(cherry picked from commit 728343983787cbd4d7ae8fa2007a157bb140f02a)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Message-Id: <b10f29e40efb516e15a053c2e3aa8963c3ea9715.1564495366.git.mprivozn@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/util/vircommand.c | 7 +------

 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/util/vircommand.c b/src/util/vircommand.c

index 2353a4a554..dfc7e5428b 100644

--- a/src/util/vircommand.c

+++ b/src/util/vircommand.c

@@ -519,12 +519,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED,

             goto cleanup;

         }

-        if (virBitmapSetBit(fds, fd) < 0) {

-            virReportError(VIR_ERR_INTERNAL_ERROR,

-                           _("unable to set FD as open: %d"),

-                           fd);

-            goto cleanup;

-        }

+        ignore_value(virBitmapSetBit(fds, fd));

     }

     if (rc < 0)

-- 

2.22.0