Fix vgconvert logical volume id metadata validation.

If volume group is downconverted to lvm1 format,
check if lvid has supported format for conversion to lv_num in lvm1.

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/uuid/uuid.c b/lib/uuid/uuid.c
index 03fe5c556..da4093f7a 100644
--- a/lib/uuid/uuid.c
+++ b/lib/uuid/uuid.c
@@ -67,11 +67,29 @@ int lvnum_from_lvid(union lvid *lvid)
 		lv_num *= sizeof(_c) - 1;
 		if ((c = strchr(_c, lvid->id[1].uuid[i])))
 			lv_num += (int) (c - _c);
+		if (lv_num < 0)
+			lv_num = 0;
 	}
 
 	return lv_num;
 }
 
+int lvid_in_restricted_range(union lvid *lvid)
+{
+	int i;
+
+	for (i = 0; i < ID_LEN - 3; i++)
+		if (lvid->id[1].uuid[i] != '0')
+			return 0;
+
+	for (i = ID_LEN - 3; i < ID_LEN; i++)
+		if (!isdigit(lvid->id[1].uuid[i]))
+			return 0;
+
+	return 1;
+}
+
+
 int id_create(struct id *id)
 {
 	int randomfile;
diff --git a/lib/uuid/uuid.h b/lib/uuid/uuid.h
index d1b03b3bf..00296393c 100644
--- a/lib/uuid/uuid.h
+++ b/lib/uuid/uuid.h
@@ -34,6 +34,7 @@ union lvid {
 
 int lvid_from_lvnum(union lvid *lvid, struct id *vgid, uint32_t lv_num);
 int lvnum_from_lvid(union lvid *lvid);
+int lvid_in_restricted_range(union lvid *lvid);
 
 void uuid_from_num(char *uuid, uint32_t num);