From 6ab6a650a418f213f51f47c8263cd635130b3c3a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 10 Oct 2012 07:57:51 +0000 Subject: disk: initialize name/part fields when returning a whole disk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When get_device_and_partition() finds a disk without a partition table, under some conditions, it "returns" a disk_partition_t that describes the entire raw disk. Make sure to initialize all fields in the partition descriptor in that case. The value chosen for name is just some arbitrary descriptive string. The value chosen for info matches the check at the end of get_device_and_partition(). However, it's probably not that important; it's not obvious that the value is really used. Reported-by: Benoît Thébaudeau Signed-off-by: Stephen Warren Reviewed-by: Benoît Thébaudeau Signed-off-by: Tom Rini diff --git a/disk/part.c b/disk/part.c index a0c77dd..8ba3cde 100644 --- a/disk/part.c +++ b/disk/part.c @@ -561,6 +561,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str, info->size = (*dev_desc)->lba; info->blksz = (*dev_desc)->blksz; info->bootable = 0; + strcpy((char *)info->type, BOOT_PART_TYPE); + strcpy((char *)info->name, "Whole Disk"); #ifdef CONFIG_PARTITION_UUIDS info->uuid[0] = 0; #endif -- cgit v0.10.2