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

Check data device offset if it fits data device size in luksFormat.

Browse Source
This commit is contained in:
Milan Broz
2018-12-11 21:28:51 +01:00
parent 7d8003da46
commit 2a1d58ed22
6 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/luks2/luks2_disk_metadata.c
View File

@@ -359,31 +359,6 @@ static int hdr_write_disk(struct crypt_device *cd,
return r;
}
static int LUKS2_check_device_size(struct crypt_device *cd, struct device *device,
uint64_t hdr_size, int falloc)
{
uint64_t dev_size;
if (device_size(device, &dev_size)) {
log_dbg(cd, "Cannot get device size for device %s.", device_path(device));
return -EIO;
}
log_dbg(cd, "Device size %" PRIu64 ", header size %" PRIu64 ".", dev_size, hdr_size);
if (hdr_size > dev_size) {
/* If it is header file, increase its size */
if (falloc && !device_fallocate(device, hdr_size))
return 0;
log_err(cd, _("Device %s is too small. (LUKS2 requires at least %" PRIu64 " bytes.)"),
device_path(device), hdr_size);
return -EINVAL;
}
return 0;
}
/*
* Convert in-memory LUKS2 header and write it to disk.
* This will increase sequence id, write both header copies and calculate checksum.
@@ -400,7 +375,7 @@ int LUKS2_disk_hdr_write(struct crypt_device *cd, struct luks2_hdr *hdr, struct
return -EINVAL;
}
r = LUKS2_check_device_size(cd, crypt_metadata_device(cd), LUKS2_hdr_and_areas_size(hdr->jobj), 1);
r = device_check_size(cd, crypt_metadata_device(cd), LUKS2_hdr_and_areas_size(hdr->jobj), 1);
if (r)
return r;
@@ -665,7 +640,7 @@ int LUKS2_disk_hdr_read(struct crypt_device *cd, struct luks2_hdr *hdr,
goto err;
}
r = LUKS2_check_device_size(cd, device, hdr_size, 0);
r = device_check_size(cd, device, hdr_size, 0);
if (r)
goto err;