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

Return correct data offset for BITLK in crypt_get_data_offset

Browse Source 
First part of the encrypted data will be always directly after
the header.

Fixes: #518
This commit is contained in:
Vojtěch Trefný
2020-01-17 14:00:12 +01:00
committed by Vojtech Trefny
parent e4387d2bd1
commit 61f5dcb11e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bitlk/bitlk.c
View File

@@ -1003,7 +1003,7 @@ int BITLK_activate(struct crypt_device *cd,
} }
r = device_block_adjust(cd, crypt_data_device(cd), DEV_EXCL, r = device_block_adjust(cd, crypt_data_device(cd), DEV_EXCL,
crypt_get_data_offset(cd), &dmd.size, &dmd.flags); 0, &dmd.size, &dmd.flags);
if (r) { if (r) {
crypt_free_volume_key(open_fvek_key); crypt_free_volume_key(open_fvek_key);
return r; return r;

3
lib/setup.c
View File

@@ -5266,6 +5266,9 @@ uint64_t crypt_get_data_offset(struct crypt_device *cd)
if (isTCRYPT(cd->type)) if (isTCRYPT(cd->type))
return TCRYPT_get_data_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params); return TCRYPT_get_data_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
if (isBITLK(cd->type))
return cd->u.bitlk.params.volume_header_size / SECTOR_SIZE;
return cd->data_offset; return cd->data_offset;
} }