From 8a568b956248240844971249f1221effe80604e2 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 16 Nov 2018 15:54:09 +0100 Subject: [PATCH] libdm: do not add params for resume and remove DM_DEVICE_CREATE with table is doing several ioctl operations, however only some of then takes parameters. Since _create_and_load_v4() reused already existing dm task from DM_DEVICE_RELOAD it has also kept passing its table parameters to DM_DEVICE_RESUME ioctl - but this ioctl is supposed to not take any argument and thus there is no wiping of passed data - and since kernel returns buffer and shortens dmi->data_size accordingly, anything past returned data size remained uncleared in zfree() function. This has problem if the user used dm_task_secure_data (i.e. cryptsetup), as in this case binary expact secured data are erased from main memory after use, but they may have been left in place. This patch is also closing the possible hole for error path, which also reuse same dm task structure for DM_DEVICE_REMOVE. (cherry picked from commit 10e191fd124e89d40518a7cba5d61c47be5a0969) --- WHATS_NEW_DM | 1 + device_mapper/ioctl/libdm-iface.c | 2 ++ libdm/ioctl/libdm-iface.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 7049a4cf1..d0088c448 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.155 - ==================================== + Do not add parameters for RESUME with DM_DEVICE_CREATE dm task. Version 1.02.153 - 31st October 2018 ==================================== diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index 4de396cb9..2920343af 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -1456,6 +1456,7 @@ static int _create_and_load_v4(struct dm_task *dmt) dmt->uuid = NULL; free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; + _dm_task_free_targets(dmt); if (dm_task_run(dmt)) return 1; @@ -1466,6 +1467,7 @@ static int _create_and_load_v4(struct dm_task *dmt) dmt->uuid = NULL; free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; + _dm_task_free_targets(dmt); /* * Also udev-synchronize "remove" dm task that is a part of this revert! diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 8987bd2fd..5844029ce 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -1468,6 +1468,7 @@ static int _create_and_load_v4(struct dm_task *dmt) dmt->uuid = NULL; dm_free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; + _dm_task_free_targets(dmt); if (dm_task_run(dmt)) return 1; @@ -1478,6 +1479,7 @@ static int _create_and_load_v4(struct dm_task *dmt) dmt->uuid = NULL; dm_free(dmt->mangled_uuid); dmt->mangled_uuid = NULL; + _dm_task_free_targets(dmt); /* * Also udev-synchronize "remove" dm task that is a part of this revert!