summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-02-27 01:19:23 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2012-08-23 14:37:18 +0200
commitb1640df5e6375926df0cc0e8dab217b21b23ce57 (patch)
treef5f11c9a90d4fee87a7309507b9df8a038db7aaa
parentb9ae22d758e6b5eed62774f5b2a71b87d818087e (diff)
downloadlvm2-b1640df5e6375926df0cc0e8dab217b21b23ce57.tar.gz
lvm2-b1640df5e6375926df0cc0e8dab217b21b23ce57.tar.xz
lvm2-b1640df5e6375926df0cc0e8dab217b21b23ce57.zip
dmsetup: check if new_name is non NULL
-rw-r--r--WHATS_NEW_DM1
-rw-r--r--tools/dmsetup.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 186a2e15..d0e8f7df 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.77 -
=================================
+ Check for existing new_name for dmsetup rename.
Fix memory leak in dmsetup _get_split_name() error path.
Version 1.02.76 - 7th August 2012
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index ca1087da..7d1f2a13 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -719,7 +719,7 @@ static int _do_rename(const char *name, const char *new_name, const char *new_uu
if (new_uuid) {
if (!dm_task_set_newuuid(dmt, new_uuid))
goto out;
- } else if (!dm_task_set_newname(dmt, new_name))
+ } else if (!new_name || !dm_task_set_newname(dmt, new_name))
goto out;
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))