Check for missing reply_uuid

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 336e556c61b170c8805697768f1f801acaa5c649..43cc9e3886f43ddc4d5b15cf2d35c59335626dcf 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.71 - 
 ====================================
+  Check for missing reply_uuid in dm_event_get_registered_device().
   Check for allocation failure in dmeventd restart().
   Add few missing allocation failures tests in dmsetup.
   Fix potential risk of writing in front of buffer in _sysfs_get_dm_name().

diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 13e8a48850170faeb0fc6d1e1016744a62c762ed..c85ef880cdcfe75d9145ff425964e397eb921002 100644 (file)
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -743,6 +743,10 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
        msg.data = NULL;
 
        _dm_event_handler_clear_dev_info(dmevh);
+       if (!reply_uuid) {
+               ret = -ENXIO; /* dmeventd probably gave us bogus uuid back */
+               goto fail;
+       }
        dmevh->uuid = dm_strdup(reply_uuid);
        if (!dmevh->uuid) {
                ret = -ENOMEM;