From: Mark Wielaard <mark@klomp.org>
Date: Sat, 3 Apr 2021 17:52:38 +0000 (+0200)
Subject: nm: Fix file descriptor leak on dwfl_begin failure.
X-Git-Tag: elfutils-0.184~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=879513aba0b765c5552fc371c7fc55df4135661e;p=thirdparty%2Felfutils.git

nm: Fix file descriptor leak on dwfl_begin failure.

If dwfl_begin fails we won't use the dwfl_fd descriptor we just dupped.
Make sure to close on dwfl_begin failure to avoid the leak.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 300deb4f8..0cea28e2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-03  Mark Wielaard  <mark@klomp.org>
+
+	* nm.c (show_symbols): close dwfl_fd if dwfl_begin fails.
+
 2021-04-03  Mark Wielaard  <mark@klomp.org>
 
 	* unstrip.c (handle_output_dir_module): Free output_file when done.
diff --git a/src/nm.c b/src/nm.c
index fb761ef3d..dc2186db6 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -1308,6 +1308,8 @@ show_symbols (int fd, Ebl *ebl, GElf_Ehdr *ehdr,
 		      dwfl_getmodules (dwfl, &getdbg_dwflmod, &get, 0);
 		    }
 		}
+	      else
+		close (dwfl_fd);
 	    }
 	}
       if (dbg != NULL)