From d7f52737d3dcfc873471d43c66e0f0029f3495ce Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 9 Jul 2018 11:55:47 +0200
Subject: [PATCH] containerfs: fix fd leak

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 780db26..6d34e76 100644
--- a/main.c
+++ b/main.c
@@ -1521,12 +1521,20 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
         {
           DIR *dp;
           size_t c = 0;
-          int fd = openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY);
+          int fd;
+
+          fd = openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY);
+          if (fd < 0)
+            {
+              fuse_reply_err (req, errno);
+              return;
+            }
 
           if (node->children)
             c = count_dir_entries (node);
           if (c)
             {
+              close (fd);
               fuse_reply_err (req, ENOTEMPTY);
               return;
             }