From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 13 Feb 2012 11:10:37 +0000 (+0000)
Subject: Add check for rimage name allocation failure
X-Git-Tag: v2_02_96~422
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=cbe6bcd593d86b055270fc7d44affe18680a4a5e;p=lvm2.git

Add check for rimage name allocation failure
---

diff --git a/WHATS_NEW b/WHATS_NEW
index 167e46923..6cd2e4d77 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.92 - 
 ====================================
+  Add check for rimage name allocation failure in _raid_add_images().
   Add check for mda_copy failure in _text_pv_setup().
   Add check for _mirrored_init_target failure.
   Add free_orphan_vg.
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 87563f5d4..50918a8cb 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -655,7 +655,10 @@ static int _raid_add_images(struct logical_volume *lv,
 			if (l == dm_list_last(&data_lvs)) {
 				lvl = dm_list_item(l, struct lv_list);
 				len = strlen(lv->name) + strlen("_rimage_XXX");
-				name = dm_pool_alloc(lv->vg->vgmem, len);
+				if (!(name = dm_pool_alloc(lv->vg->vgmem, len))) {
+					log_error("Failed to allocate rimage name.");
+					return 0;
+				}
 				sprintf(name, "%s_rimage_%u", lv->name, count);
 				lvl->lv->name = name;
 				continue;