From e3440f37f026b1e45d48f27ef1be903542b385f0 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 13 Jan 2006 13:18:41 +0100 Subject: vol_id: probe volume as user nobody Signed-off-by: Kay Sievers --- extras/volume_id/libvolume_id/mac.c | 7 ++++--- extras/volume_id/libvolume_id/volume_id.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'extras/volume_id/libvolume_id') diff --git a/extras/volume_id/libvolume_id/mac.c b/extras/volume_id/libvolume_id/mac.c index 99bcbde6be..53f0761c8a 100644 --- a/extras/volume_id/libvolume_id/mac.c +++ b/extras/volume_id/libvolume_id/mac.c @@ -84,14 +84,15 @@ int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off) part_count = be32_to_cpu(part->map_count); dbg("expecting %d partition entries", part_count); + if (part_count < 1 || part_count > 256) + return -1; if (id->partitions != NULL) free(id->partitions); - id->partitions = - malloc(part_count * sizeof(struct volume_id_partition)); + id->partitions = malloc(part_count * sizeof(struct volume_id_partition)); if (id->partitions == NULL) return -1; - memset(id->partitions, 0x00, sizeof(struct volume_id_partition)); + memset(id->partitions, 0x00, part_count * sizeof(struct volume_id_partition)); id->partition_count = part_count; diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h index ad65fe5438..edeb225faf 100644 --- a/extras/volume_id/libvolume_id/volume_id.h +++ b/extras/volume_id/libvolume_id/volume_id.h @@ -14,7 +14,7 @@ #include #include -#define VOLUME_ID_VERSION 55 +#define VOLUME_ID_VERSION 56 #define VOLUME_ID_LABEL_SIZE 64 #define VOLUME_ID_UUID_SIZE 36 -- cgit v1.2.3-54-g00ecf