From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Feb 2012 11:32:45 +0000 (+0100)
Subject: lscpu: fix fd leak
X-Git-Tag: v2.21-rc2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad655c88ff79b1b3ecb78445d9878105caf4b84e;p=thirdparty%2Futil-linux.git

lscpu: fix fd leak

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

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 6a74c4eb78..65e1eb6f11 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1138,12 +1138,14 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 			char buf[BUFSIZ];
 			int t0, t1, t2;
 
-			while (fgets(buf, sizeof(buf), fd) != NULL) {
+			while (fd && fgets(buf, sizeof(buf), fd) != NULL) {
 				if (sscanf(buf, "CPU Topology SW:%d%d%d%d%d%d",
 					   &t0, &t1, &t2, &books, &sockets_per_book,
 					   &cores_per_socket) == 6)
 					break;
 			}
+			if (fd)
+				fclose(fd);
 		}
 		print_n(_("Thread(s) per core:"), desc->nthreads / desc->ncores);
 		print_n(_("Core(s) per socket:"),