Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index b4b75dad816ad95c0028f1b64b2be73e8993caac..2e10c2f13a34986c9d8d445e1b00ea94261b2628 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -1571,7 +1571,7 @@ static sector_t __rdev_sectors(struct raid_set *rs)
                        return rdev->sectors;
        }
 
-       BUG(); /* Constructor ensures we got some. */
+       return 0;
 }
 
 /* Calculate the sectors per device and per array used for @rs */
@@ -2941,7 +2941,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        bool resize;
        struct raid_type *rt;
        unsigned int num_raid_params, num_raid_devs;
-       sector_t calculated_dev_sectors;
+       sector_t calculated_dev_sectors, rdev_sectors;
        struct raid_set *rs = NULL;
        const char *arg;
        struct rs_layout rs_layout;
@@ -3017,7 +3017,14 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (r)
                goto bad;
 
-       resize = calculated_dev_sectors != __rdev_sectors(rs);
+       rdev_sectors = __rdev_sectors(rs);
+       if (!rdev_sectors) {
+               ti->error = "Invalid rdev size";
+               r = -EINVAL;
+               goto bad;
+       }
+
+       resize = calculated_dev_sectors != rdev_sectors;
 
        INIT_WORK(&rs->md.event_work, do_table_event);
        ti->private = rs;