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

Avoid using huge dummy context in LUKS1 reencryption check.

Browse Source 
This struct is not needed at all, just use NULL.
This commit is contained in:
Milan Broz
2022-07-27 11:47:06 +02:00
parent 3e178caeaf
commit 1e2cb2d419
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils_reencrypt_luks1.c
View File

@@ -163,7 +163,7 @@ static int device_check(struct reenc_ctx *rc, const char *device, header_magic s
r = 0;
} else if (set_magic == CHECK_UNUSABLE && version == 1) {
r = memcmp(buf, NOMAGIC, MAGIC_L) ? -EINVAL : 0;
if (!r)
if (rc && !r)
rc->device_uuid = strndup(&buf[0xa8], 40);
goto out;
} else
@@ -177,7 +177,7 @@ static int device_check(struct reenc_ctx *rc, const char *device, header_magic s
log_err(_("Cannot write device %s."), device);
r = -EIO;
}
if (s > 0 && set_magic == MAKE_UNUSABLE)
if (rc && s > 0 && set_magic == MAKE_UNUSABLE)
rc->stained = 1;
}
if (r)
@@ -1337,16 +1337,10 @@ out:
int reencrypt_luks1_in_progress(const char *device)
{
int r;
struct stat st;
struct reenc_ctx dummy = {};
if (stat(device, &st) || (size_t)st.st_size < pagesize())
return -EINVAL;
r = device_check(&dummy, device, CHECK_UNUSABLE, false);
free(dummy.device_uuid);
return r;
return device_check(NULL, device, CHECK_UNUSABLE, false);
}