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

Check for error sooner while assigning reencryption segments.

Browse Source 
Also wraps function parameters definition.
This commit is contained in:
Ondrej Kozina
2019-07-30 10:59:18 +02:00
parent e7027e3d40
commit 0886bc7afd
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/luks2/luks2_reencrypt.c
View File

@@ -1556,10 +1556,14 @@ static int _assign_segments_simple(struct crypt_device *cd,
return commit ? LUKS2_hdr_write(cd, hdr) : 0; return commit ? LUKS2_hdr_write(cd, hdr) : 0;
} }
static int reenc_assign_segments(struct crypt_device *cd, struct luks2_hdr *hdr, struct luks2_reenc_context *rh, unsigned pre, unsigned commit) static int reenc_assign_segments(struct crypt_device *cd,
struct luks2_hdr *hdr,
struct luks2_reenc_context *rh,
unsigned pre,
unsigned commit)
{ {
bool forward; bool forward;
int r, rseg, scount; int rseg, scount, r = -EINVAL;
/* FIXME: validate in reencrypt context load */ /* FIXME: validate in reencrypt context load */
if (rh->digest_new < 0 && rh->type != DECRYPT) if (rh->digest_new < 0 && rh->type != DECRYPT)
@@ -1582,8 +1586,10 @@ static int reenc_assign_segments(struct crypt_device *cd, struct luks2_hdr *hdr,
r = LUKS2_segments_set(cd, hdr, rh->jobj_segs_after, 0); r = LUKS2_segments_set(cd, hdr, rh->jobj_segs_after, 0);
if (!r) if (!r)
rh->jobj_segs_after = NULL; rh->jobj_segs_after = NULL;
} else }
return -EINVAL;
if (r)
return r;
scount = LUKS2_segments_count(hdr); scount = LUKS2_segments_count(hdr);
@@ -1609,10 +1615,6 @@ static int reenc_assign_segments(struct crypt_device *cd, struct luks2_hdr *hdr,
LUKS2_digest_segment_assign(cd, hdr, 1, forward ? rh->digest_old : rh->digest_new, 1, 0); LUKS2_digest_segment_assign(cd, hdr, 1, forward ? rh->digest_old : rh->digest_new, 1, 0);
} }
/* FIXME: this doesn't look right */
if (r)
return r;
r = _add_backup_segment(cd, hdr, rh, 0); r = _add_backup_segment(cd, hdr, rh, 0);
if (r) { if (r) {
log_dbg(cd, "Failed to assign pre reencryption backup segment."); log_dbg(cd, "Failed to assign pre reencryption backup segment.");