device_mapper: zero only secure buffers

Securely erase before free() only dm_tasks marked as secure_data.
TODO: think about also using this for libdm/.

diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 1140798e675a7d462caab064fcb13c63fd908f31..116fa3dc152f2c7cfdc580ce9a91e67a5facb9e0 100644 (file)
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -493,7 +493,10 @@ static void _dm_task_free_targets(struct dm_task *dmt)
 
        for (t = dmt->head; t; t = n) {
                n = t->next;
-               _dm_zfree_string(t->params);
+               if (dmt->secure_data)
+                       _dm_zfree_string(t->params);
+               else
+                       free(t->params);
                free(t->type);
                free(t);
        }
@@ -504,7 +507,10 @@ static void _dm_task_free_targets(struct dm_task *dmt)
 void dm_task_destroy(struct dm_task *dmt)
 {
        _dm_task_free_targets(dmt);
-       _dm_zfree_dmi(dmt->dmi.v4);
+       if (dmt->secure_data)
+               _dm_zfree_dmi(dmt->dmi.v4);
+       else
+               free(dmt->dmi.v4);
        free(dmt->dev_name);
        free(dmt->mangled_dev_name);
        free(dmt->newname);