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

Unify checks for misaligned values.

Browse Source
This commit is contained in:
Ondrej Kozina
2018-08-24 11:27:40 +02:00
committed by Milan Broz
parent 622943529e
commit d41b1a7560
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/luks2/luks2_json_metadata.c
View File

@@ -535,14 +535,16 @@ static int hdr_validate_crypt_segment(json_object *jobj, const char *key, json_o
}
sector_size = json_object_get_uint32(jobj_sector_size);
if (!sector_size || sector_size % SECTOR_SIZE) {
if (!sector_size || MISALIGNED_512(sector_size)) {
log_dbg("Illegal sector size: %" PRIu32, sector_size);
return 1;
}
if (!numbered("iv_tweak", json_object_get_string(jobj_ivoffset)) ||
!json_str_to_uint64(jobj_ivoffset, &ivoffset))
!json_str_to_uint64(jobj_ivoffset, &ivoffset)) {
log_dbg("Illegal iv_tweak value.");
return 1;
}
if (size % sector_size) {
log_dbg("Size field has to be aligned to sector size: %" PRIu32, sector_size);
@@ -594,11 +596,11 @@ static int hdr_validate_segments(json_object *hdr_jobj)
size = 0;
/* all device-mapper devices are aligned to 512 sector size */
if (offset % SECTOR_SIZE) {
if (MISALIGNED_512(offset)) {
log_dbg("Offset field has to be aligned to sector size: %" PRIu32, SECTOR_SIZE);
return 1;
}
if (size % SECTOR_SIZE) {
if (MISALIGNED_512(size)) {
log_dbg("Size field has to be aligned to sector size: %" PRIu32, SECTOR_SIZE);
return 1;
}
@@ -722,7 +724,7 @@ static int validate_keyslots_size(json_object *hdr_jobj, json_object *jobj_keysl
if (!json_str_to_uint64(jobj_keyslots_size, &keyslots_size))
return 1;
if (keyslots_size % 4096) {
if (MISALIGNED_4K(keyslots_size)) {
log_dbg("keyslots_size is not 4 KiB aligned");
return 1;
}
@@ -779,7 +781,7 @@ static int hdr_validate_config(json_object *hdr_jobj)
return 1;
}
if (json_size % 4096) {
if (MISALIGNED_4K(json_size)) {
log_dbg("Json area is not properly aligned to 4 KiB.");
return 1;
}

4
lib/luks2/luks2_keyslot_luks2.c
View File

@@ -48,7 +48,7 @@ static int luks2_encrypt_to_storage(char *src, size_t srcLength,
int devfd = -1, r;
/* Only whole sector writes supported */
if (srcLength % SECTOR_SIZE)
if (MISALIGNED_512(srcLength))
return -EINVAL;
/* Encrypt buffer */
@@ -113,7 +113,7 @@ static int luks2_decrypt_from_storage(char *dst, size_t dstLength,
int devfd = -1, r;
/* Only whole sector writes supported */
if (dstLength % SECTOR_SIZE)
if (MISALIGNED_512(dstLength))
return -EINVAL;
r = crypt_storage_init(&s, 0, cipher, cipher_mode, vk->key, vk->keylength);