From 4388a09b0f9d070884ecd0e8a128f20539991dfe Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 22 Dec 2010 15:28:44 +0000 Subject: [PATCH] Detect errors from dm_task_set calls Check for errors in dm_task_set calls. Use goto_bad macro with stack trace. Replace label failed: with bad:. --- WHATS_NEW | 1 + daemons/dmeventd/libdevmapper-event.c | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2ba8e8555..4fc811bc5 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.80 - ==================================== + Detect errors from dm_task_set calls in _get_device_info (dmeventd). Add backtraces for archive and backup_locally in check_current_backup(). Fix memory leak in debug mode of restart_clvmd() error path. Log error message for pthread_join() failure in clvmd. diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index bc8ad993d..05ebf0abe 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -538,34 +538,37 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh) return NULL; } - if (dmevh->uuid) - dm_task_set_uuid(dmt, dmevh->uuid); - else if (dmevh->dev_name) - dm_task_set_name(dmt, dmevh->dev_name); - else if (dmevh->major && dmevh->minor) { - dm_task_set_major(dmt, dmevh->major); - dm_task_set_minor(dmt, dmevh->minor); - } + if (dmevh->uuid) { + if (!dm_task_set_uuid(dmt, dmevh->uuid)) + goto_bad; + } else if (dmevh->dev_name) { + if (!dm_task_set_name(dmt, dmevh->dev_name)) + goto_bad; + } else if (dmevh->major && dmevh->minor) { + if (!dm_task_set_major(dmt, dmevh->major) || + !dm_task_set_minor(dmt, dmevh->minor)) + goto_bad; + } /* FIXME Add name or uuid or devno to messages */ if (!dm_task_run(dmt)) { log_error("_get_device_info: dm_task_run() failed"); - goto failed; + goto bad; } if (!dm_task_get_info(dmt, &info)) { log_error("_get_device_info: failed to get info for device"); - goto failed; + goto bad; } if (!info.exists) { log_error("_get_device_info: device not found"); - goto failed; + goto bad; } return dmt; -failed: + bad: dm_task_destroy(dmt); return NULL; }