Make sure dereferenced words[0] and words[1] are defined

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 4da95deed4426564422a53a131e2e94bc6108133..0f598c6d4684432282ef874296fffbc60fbe5762 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.71 - 
 ====================================
+  Test for parsed words in _umount() dmeventd snapshot plugin.
   Fix memory leak in fail path of parse_loop_device_name() in dmsetup.
   Check for missing reply_uuid in dm_event_get_registered_device().
   Check for allocation failure in dmeventd restart().

diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
index 18fa39047ad232a9e1b17a4ad1ca6a0c725e4ca4..0c59e340ae8b6541f59987c5343d5b8207d8d889 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -144,7 +144,8 @@ static void _umount(const char *device, int major, int minor)
                        break; /* eof, likely */
 
                /* words[0] is the mount point and words[1] is the device path */
-               dm_split_words(buffer, 3, 0, words);
+               if (dm_split_words(buffer, 3, 0, words) < 2)
+                       continue;
 
                /* find the major/minor of the device */
                if (stat(words[0], &st))