From: Karel Zak <kzak@redhat.com>
Date: Tue, 31 Jan 2012 13:56:34 +0000 (+0100)
Subject: libblkid: make fd usage in md code more robust
X-Git-Tag: v2.21-rc2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8af0d7bc44a124c4aba2908d00f516003ebef454;p=thirdparty%2Futil-linux.git

libblkid: make fd usage in md code more robust

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

diff --git a/libblkid/src/topology/md.c b/libblkid/src/topology/md.c
index d140554658..a24fbaca62 100644
--- a/libblkid/src/topology/md.c
+++ b/libblkid/src/topology/md.c
@@ -109,8 +109,10 @@ static int probe_md_tp(blkid_probe pr,
 	if (ioctl(fd, GET_ARRAY_INFO, &md))
 		goto nothing;
 
-	if (fd != pr->fd)
+	if (fd >= 0 && fd != pr->fd) {
 		close(fd);
+		fd = -1;
+	}
 
 	/*
 	 * Ignore levels we don't want aligned (e.g. linear)
@@ -138,7 +140,7 @@ static int probe_md_tp(blkid_probe pr,
 	return 0;
 
 nothing:
-	if (fd != -1 && fd != pr->fd)
+	if (fd >= 0 && fd != pr->fd)
 		close(fd);
 	return 1;
 }