eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crypt_wipe to allocate space and not silently fail.

Browse Source 
This change will allocate space if underlying device is smaller file
and fail if it is block device.

Previously smaller device was quietly ignored, leading to keyslot
access failure with older dm-crypt mapped keyslot encryption
(disabled kernel user crypto API).
This commit is contained in:
Milan Broz
2019-02-06 16:14:24 +01:00
parent 0cac4a4e0c
commit ebbc5eceb8
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/utils_wipe.c
View File

@@ -161,19 +161,16 @@ int crypt_wipe_device(struct crypt_device *cd,
if (devfd < 0) if (devfd < 0)
return errno ? -errno : -EINVAL; return errno ? -errno : -EINVAL;
r = device_size(device, &dev_size); if (length)
if (r || dev_size == 0)
goto out;
if (dev_size < length)
length = 0;
if (length) {
if ((dev_size <= offset) || (dev_size - offset) < length) {
r = -EINVAL;
goto out;
}
dev_size = offset + length; dev_size = offset + length;
else {
r = device_size(device, &dev_size);
if (r)
return r;
if (dev_size <= offset)
return -EINVAL;
length = dev_size - offset;
} }
r = posix_memalign((void **)&sf, alignment, wipe_block_size); r = posix_memalign((void **)&sf, alignment, wipe_block_size);