From: Karel Zak <kzak@redhat.com>
Date: Fri, 9 Nov 2012 11:59:33 +0000 (+0100)
Subject: lib/console: fix possible fd leak
X-Git-Tag: v2.23-rc1~539
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=874dbb9c9215d3120fc572c4b2cdd6d24fdd483e;p=thirdparty%2Futil-linux.git

lib/console: fix possible fd leak

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/consoles.c b/lib/consoles.c
index a0faa69209..7bc21b61c9 100644
--- a/lib/consoles.c
+++ b/lib/consoles.c
@@ -577,14 +577,17 @@ int detect_consoles(const char *device, int fallback, struct console **consoles)
 		if (!dir)
 			goto fallback;
 		name = scandev(dir, comparedev);
+		closedir(dir);
+
 		if (name) {
 			rc = append_console(consoles, name);
 			if (rc < 0)
 				return rc;
 		}
-		closedir(dir);
 		if (!*consoles)
 			goto fallback;
+
+		DBG(dbgprint("detection success [rc=%d]", reconnect));
 		return reconnect;
 	}
 #ifdef __linux__