summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMauricio Faria de Oliveira <mfo@canonical.com>2018-07-26 04:46:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 09:33:54 +0300
commit845a0a1b29dc4af57e6ed7beb8d943bfd7e74617 (patch)
treebbb45f39bbef8b13eed1f31fe7dd2d0a3a7ef813 /block
parent2541d77bf0c8733ea276f9fb798f850a494a8560 (diff)
downloadlinux-845a0a1b29dc4af57e6ed7beb8d943bfd7e74617.tar.xz
partitions/aix: append null character to print data from disk
[ 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>
Diffstat (limited to 'block')
-rw-r--r--block/partitions/aix.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/block/partitions/aix.c b/block/partitions/aix.c
index f3ed7b2d89bf..fa74698e12a6 100644
--- a/block/partitions/aix.c
+++ b/block/partitions/aix.c
@@ -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);