[PATCH] block: fix UUID string buffer length

From: Rabin Vincent
Date: Wed Oct 05 2011 - 05:53:30 EST


The UUID string buffer is several bytes shorter than what is actually
required, because the space for the hyphens hasn't been taken into
account. Fix it, while also making it a regular char[] rather than a
u8[] to make it clear what we're storing here.

Cc: Will Drewry <wad@xxxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
---
block/genhd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 8dfa21e..fa955b5 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -736,7 +736,7 @@ void __init printk_all_partitions(void)
struct hd_struct *part;
char name_buf[BDEVNAME_SIZE];
char devt_buf[BDEVT_SIZE];
- u8 uuid[PARTITION_META_INFO_UUIDLTH * 2 + 1];
+ char uuid[sizeof("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];

/*
* Don't show empty devices or things that have been
@@ -755,7 +755,7 @@ void __init printk_all_partitions(void)
while ((part = disk_part_iter_next(&piter))) {
bool is_part0 = part == &disk->part0;

- uuid[0] = 0;
+ uuid[0] = '\0';
if (part->info)
part_unpack_uuid(part->info->uuid, uuid);

--
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/