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 d1405546583b0ec3c64d722c6a31668ded828baf..a24fbaca62b89ff35c28cc2a86fbe2057950626d 100644 (file)
--- 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;
 }