Only in mdadm-inter/: ANNOUNCE-2.0-devel-1

Only in mdadm-inter/: ANNOUNCE-2.0-devel-2
Only in mdadm-inter/: Create.c.orig
Only in mdadm-inter/: bitmap.c
Only in mdadm-inter/: bitmap.h
Only in mdadm-inter/: mdassemble.8
Only in mdadm-inter/: mkd1
diff -ru mdadm-pre/mdadm-1.11.0/super1.c mdadm-inter/super1.c
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/super1.c b/super1.c
index 86787653b7273d9decb3295752816853489366a9..736ed7ddeedfba4399ce5f35a1367fa5671d05db 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -478,11 +478,15 @@ static int write_init_super1(struct supertype *st, void *sbv, mdu_disk_info_t *d
        *(__u32*)(sb->device_uuid+12) = random();
 
     
-       if (ioctl(fd, BLKGETSIZE, &size))
+       if (ioctl(fd, BLKGETSIZE, &size)) {
+               close(fd);
                return 1;
+       }
 
-       if (size < 24)
+       if (size < 24) {
+               close(fd);
                return 2;
+       }
 
 
        /*
@@ -522,6 +526,7 @@ static int write_init_super1(struct supertype *st, void *sbv, mdu_disk_info_t *d
        rv = store_super1(fd, sb);
        if (rv)
                fprintf(stderr, Name ": failed to write superblock to %s\n", devname);
+       close(fd);
        return rv;
 }