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

Fix broken segments calculation for backward data shift reencryption.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-07-24 18:29:19 +02:00
parent 212703edf8
commit 35068c2e6e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/luks2/luks2_reencrypt.c
View File

@@ -375,8 +375,8 @@ static json_object *_reenc_segments_backward_after(struct crypt_device *cd,
jobj_old_seg = json_segments_get_segment(rh->jobj_segs_pre, reenc_seg - 1); jobj_old_seg = json_segments_get_segment(rh->jobj_segs_pre, reenc_seg - 1);
if (jobj_old_seg) if (jobj_old_seg)
json_object_object_add_by_uint(jobj_segs_after, reenc_seg - 1, json_object_get(jobj_old_seg)); json_object_object_add_by_uint(jobj_segs_after, reenc_seg - 1, json_object_get(jobj_old_seg));
if (rh->fixed_length) { if (rh->fixed_length && rh->offset) {
fixed_length = rh->device_size - data_offset - rh->offset + rh->data_shift; fixed_length = rh->device_size - rh->offset;
jobj_new_seg_after = LUKS2_create_segment_new(cd, hdr, rh, data_offset, rh->offset, rh->offset, &fixed_length); jobj_new_seg_after = LUKS2_create_segment_new(cd, hdr, rh, data_offset, rh->offset, rh->offset, &fixed_length);
} else } else
jobj_new_seg_after = LUKS2_create_segment_new(cd, hdr, rh, data_offset, rh->offset, rh->offset, NULL); jobj_new_seg_after = LUKS2_create_segment_new(cd, hdr, rh, data_offset, rh->offset, rh->offset, NULL);