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

Make the crypt_reencrypt() API fix actually matter.

Browse Source 
Pick one:
Thou shalt not skip writting tests!
One does not simply fix a bug
This commit is contained in:
Ondrej Kozina
2020-10-30 14:15:30 +01:00
committed by Milan Broz
parent 08abc0eb77
commit 9bc45ae15f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/luks2/luks2_reencrypt.c
View File

@@ -3302,14 +3302,15 @@ static void reencrypt_teardown_fatal(struct crypt_device *cd, struct luks2_hdr *
static int reencrypt_teardown(struct crypt_device *cd, struct luks2_hdr *hdr, static int reencrypt_teardown(struct crypt_device *cd, struct luks2_hdr *hdr,
struct luks2_reencrypt *rh, reenc_status_t rs, bool interrupted, struct luks2_reencrypt *rh, reenc_status_t rs, bool interrupted,
int (*progress)(uint64_t size, uint64_t offset, void *usrptr)) int (*progress)(uint64_t size, uint64_t offset, void *usrptr),
void *usrptr)
{ {
int r; int r;
switch (rs) { switch (rs) {
case REENC_OK: case REENC_OK:
if (progress && !interrupted) if (progress && !interrupted)
progress(rh->device_size, rh->progress, NULL); progress(rh->device_size, rh->progress, usrptr);
r = reencrypt_teardown_ok(cd, hdr, rh); r = reencrypt_teardown_ok(cd, hdr, rh);
break; break;
case REENC_FATAL: case REENC_FATAL:
@@ -3371,7 +3372,7 @@ int crypt_reencrypt(struct crypt_device *cd,
break; break;
log_dbg(cd, "Progress %" PRIu64 ", device_size %" PRIu64, rh->progress, rh->device_size); log_dbg(cd, "Progress %" PRIu64 ", device_size %" PRIu64, rh->progress, rh->device_size);
if (progress && progress(rh->device_size, rh->progress, NULL)) if (progress && progress(rh->device_size, rh->progress, usrptr))
quit = true; quit = true;
r = reencrypt_context_update(cd, rh); r = reencrypt_context_update(cd, rh);
@@ -3385,7 +3386,7 @@ int crypt_reencrypt(struct crypt_device *cd,
log_dbg(cd, "Next reencryption chunk size will be %" PRIu64 " sectors).", rh->length); log_dbg(cd, "Next reencryption chunk size will be %" PRIu64 " sectors).", rh->length);
} }
r = reencrypt_teardown(cd, hdr, rh, rs, quit, progress); r = reencrypt_teardown(cd, hdr, rh, rs, quit, progress, usrptr);
return r; return r;
} }