Skip to contentSkip to conversation

Fix resource leak

PATCH Applied Li Wang 2 participants 4 messages Nov 18, 2013 – Nov 25, 2013

lore
Share & tools
lore

Li Wang

author
#0 lore raw

cover Fix resource leak

Fix two coverity issues.

Li Wang (2):
rbd: Release resource before return
mds: Release resource before return

 src/mds/MDCache.cc |    2 +-
 src/rbd.cc         |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 mds: Release resource before return

Close file before return.
Fix coverity issue: CID 1019571

---
 src/mds/MDCache.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/mds/MDCache.cc +1 -1
index ae59c26..17d4ce4 100644
@@ -11731,7 +11731,7 @@ void MDCache::dump_cache(const char *fn)
     std::string s = ss.str();
     r = safe_write(fd, s.c_str(), s.length());
     if (r < 0)
-      return;
+      goto out;
 
     list<CDir*> dfs;
     in->get_dirfrags(dfs);
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 rbd: Release resource before return

In reply to Li Wang

Close file before return.
Fix coverity issue: CID 1019579

---
 src/rbd.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
src/rbd.cc +3 -3
index 41cd243..9556fb8 100644
@@ -1125,8 +1125,10 @@ static int do_export_diff(librbd::Image& image, const char *fromsnapname,
     ::encode(endsize, bl);
 
     r = bl.write_fd(fd);
-    if (r < 0)
+    if (r < 0) {
+      close(fd);
       return r;
+    }
   }
 
   ExportContext ec(&image, fd, info.size);
@@ -1139,8 +1141,6 @@ static int do_export_diff(librbd::Image& image, const char *fromsnapname,
     bufferlist bl;
     ::encode(tag, bl);
     r = bl.write_fd(fd);
-    if (r < 0)
-      return r;
   }
 
  out:
Signature · 1 line
1.7.9.5
Applied
#3 lore raw
In reply to Li Wang
Quoted 9 lines · Li Wang

Fix two coverity issues.

Li Wang (2):
rbd: Release resource before return
mds: Release resource before return

  src/mds/MDCache.cc |    2 +-
  src/rbd.cc         |    6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)

Applied both, thanks!

Josh