1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 52f0de394632..a550a057d991 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -844,8 +844,8 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
 {
         /* target parameters */
         static struct param _params[] = {
-                {1, 1024, "invalid number of priority groups"},
-                {1, 1024, "invalid initial priority group number"},
+                {0, 1024, "invalid number of priority groups"},
+                {0, 1024, "invalid initial priority group number"},
         };
 
         int r;
@@ -879,6 +879,13 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
         if (r)
                 goto bad;
 
+        if ((!m->nr_priority_groups && next_pg_num) ||
+            (m->nr_priority_groups && !next_pg_num)) {
+                ti->error = "invalid initial priority group";
+                r = -EINVAL;
+                goto bad;
+        }
+
         /* parse the priority groups */
         while (as.argc) {
                 struct priority_group *pg;
@@ -1415,7 +1422,7 @@ static int multipath_status(struct dm_target *ti, status_type_t type,
         else if (m->current_pg)
                 pg_num = m->current_pg->pg_num;
         else
-                        pg_num = 1;
+                pg_num = (m->nr_priority_groups ? 1 : 0);
 
         DMEMIT("%u ", pg_num);