Merge branch 'i2c/for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[linux.git] / block / partitions / aix.c

diff --git a/block/partitions/aix.c b/block/partitions/aix.c
index 007f95eea0e1a9b6b79751ce6f109d151daa12f4..903f3ed175d0263344fe33ecbe19dfaeffcb202e 100644 (file)
--- a/block/partitions/aix.c
+++ b/block/partitions/aix.c
@@ -178,7 +178,7 @@ int aix_partition(struct parsed_partitions *state)
        u32 vgda_sector = 0;
        u32 vgda_len = 0;
        int numlvs = 0;
-       struct pvd *pvd;
+       struct pvd *pvd = NULL;
        struct lv_info {
                unsigned short pps_per_lv;
                unsigned short pps_found;
@@ -232,10 +232,11 @@ int aix_partition(struct parsed_partitions *state)
                                if (lvip[i].pps_per_lv)
                                        foundlvs += 1;
                        }
+                       /* pvd loops depend on n[].name and lvip[].pps_per_lv */
+                       pvd = alloc_pvd(state, vgda_sector + 17);
                }
                put_dev_sector(sect);
        }
-       pvd = alloc_pvd(state, vgda_sector + 17);
        if (pvd) {
                int numpps = be16_to_cpu(pvd->pp_count);
                int psn_part1 = be32_to_cpu(pvd->psn_part1);
@@ -282,10 +283,14 @@ int aix_partition(struct parsed_partitions *state)
                                next_lp_ix += 1;
                }
                for (i = 0; i < state->limit; i += 1)
-                       if (lvip[i].pps_found && !lvip[i].lv_is_contiguous)
+                       if (lvip[i].pps_found && !lvip[i].lv_is_contiguous) {
+                               char tmp[sizeof(n[i].name) + 1]; // null char
+
+                               snprintf(tmp, sizeof(tmp), "%s", n[i].name);
                                pr_warn("partition %s (%u pp's found) is "
                                        "not contiguous\n",
-                                       n[i].name, lvip[i].pps_found);
+                                       tmp, lvip[i].pps_found);
+                       }
                kfree(pvd);
        }
        kfree(n);