diff mbox

ubi-utils: Fix file descriptor leaks in libubi

Message ID 20140330005210.6df43941@abel
State Accepted
Headers show

Commit Message

Daniel van Gerpen March 29, 2014, 11:52 p.m. UTC 
Signed-off-by: Daniel van Gerpen <daniel@vangerpen.de>
---
 ubi-utils/libubi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Artem Bityutskiy March 31, 2014, 9:53 a.m. UTC | #1 
On Sun, 2014-03-30 at 00:52 +0100, Daniel van Gerpen wrote:
> Signed-off-by: Daniel van Gerpen <daniel@vangerpen.de>

Tweaked a bit and pushed to mtd-utils, thanks!
diff mbox

Patch

diff --git a/ubi-utils/libubi.c b/ubi-utils/libubi.c
index 598191e..c2d67af 100644
--- a/ubi-utils/libubi.c
+++ b/ubi-utils/libubi.c
@@ -419,6 +419,11 @@  static int vol_node2nums(struct libubi *lib, const char *node, int *dev_num,
 		errno = ENODEV;
 		return -1;
 	}
+	
+	if (close(fd)) {
+		sys_errmsg("close failed on \"%s\"", file);
+		return -1;
+	}
 
 	*dev_num = i;
 	*vol_id = minor - 1;
@@ -910,6 +915,11 @@  int ubi_probe_node(libubi_t desc, const char *node)
 	fd = open(file, O_RDONLY);
 	if (fd == -1)
 		goto out_not_ubi;
+	
+        if (close(fd)) {
+		sys_errmsg("close failed on \"%s\"", file);
+		return -1;
+	}
 
 	return 2;