OSDN Git Service

partitions/aix: append null character to print data from disk
authorMauricio Faria de Oliveira <mfo@canonical.com>
Thu, 26 Jul 2018 01:46:29 +0000 (22:46 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Sep 2018 20:48:59 +0000 (22:48 +0200)
[ Upstream commit d43fdae7bac2def8c4314b5a49822cb7f08a45f1 ]

Even if properly initialized, the lvname array (i.e., strings)
is read from disk, and might contain corrupt data (e.g., lack
the null terminating character for strings).

So, make sure the partition name string used in pr_warn() has
the null terminating character.

Fixes: 6ceea22bbbc8 ("partitions: add aix lvm partition support files")
Suggested-by: Daniel J. Axtens <daniel.axtens@canonical.com>
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
block/partitions/aix.c

index f3ed7b2..fa74698 100644 (file)
@@ -281,10 +281,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);