mount: free loop device on failure

Testcase:
$ mount -oloop /etc/group /mnt
ioctl: LOOP_CLR_FD: Device or resource busy
mount: you must specify the filesystem type
$ losetup /dev/loop0
/dev/loop0: [0803]:1931929 (/etc/group)

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

diff --git a/mount/fsprobe_volumeid.c b/mount/fsprobe_volumeid.c
index 4b58e720e5274b4348c97135696b95d86a9cf15f..6b47392bc1535ba9843ef88cd4f0bc9e5c2263b4 100644 (file)
--- a/mount/fsprobe_volumeid.c
+++ b/mount/fsprobe_volumeid.c
@@ -34,8 +34,10 @@ static char
                return NULL;
 
        id = volume_id_open_fd(fd);
-       if (!id)
+       if (!id) {
+               close(fd);
                return NULL;
+       }
 
        /* TODO: use blkdev_get_size() */
        if (ioctl(fd, BLKGETSIZE64, &size) != 0)
@@ -61,6 +63,7 @@ static char
        }
 
        volume_id_close(id);
+       close(fd);
        return value;
 }
 

diff --git a/mount/lomount.c b/mount/lomount.c
index ae9eb36e73608473436b34280e7788688747178f..ace474cb34b3d8d1505196a393ba3fe35760f555 100644 (file)
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -398,6 +398,7 @@ del_loop (const char *device) {
        }
        if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
                perror ("ioctl: LOOP_CLR_FD");
+               close(fd);
                return 1;
        }
        close (fd);