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

Fix regression in veracrypt system partition unlock.

Browse Source 
Do not close base device file descriptor before reading from it.

Fixes #472.
This commit is contained in:
Ondrej Kozina
2019-08-22 13:56:27 +02:00
parent fc69c6fac4
commit b72ea28540
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tcrypt/tcrypt.c
View File

@@ -630,7 +630,7 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
struct tcrypt_phdr *hdr, struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params) struct crypt_params_tcrypt *params)
{ {
struct device *base_device, *device = crypt_metadata_device(cd); struct device *base_device = NULL, *device = crypt_metadata_device(cd);
ssize_t hdr_size = sizeof(struct tcrypt_phdr); ssize_t hdr_size = sizeof(struct tcrypt_phdr);
char *base_device_path; char *base_device_path;
int devfd, r; int devfd, r;
@@ -653,11 +653,11 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
if (r < 0) if (r < 0)
return r; return r;
devfd = device_open(cd, base_device, O_RDONLY); devfd = device_open(cd, base_device, O_RDONLY);
device_free(cd, base_device);
} else } else
devfd = device_open(cd, device, O_RDONLY); devfd = device_open(cd, device, O_RDONLY);
if (devfd < 0) { if (devfd < 0) {
device_free(cd, base_device);
log_err(cd, _("Cannot open device %s."), device_path(device)); log_err(cd, _("Cannot open device %s."), device_path(device));
return -EINVAL; return -EINVAL;
} }
@@ -694,6 +694,7 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
device_alignment(device), hdr, hdr_size, 0) == hdr_size) device_alignment(device), hdr, hdr_size, 0) == hdr_size)
r = TCRYPT_init_hdr(cd, hdr, params); r = TCRYPT_init_hdr(cd, hdr, params);
device_free(cd, base_device);
if (r < 0) if (r < 0)
memset(hdr, 0, sizeof (*hdr)); memset(hdr, 0, sizeof (*hdr));
return r; return r;