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

No need to lock data device in crypt_format.

Browse Source
This commit is contained in:
Ondrej Kozina
2018-08-07 16:47:34 +02:00
committed by Milan Broz
parent c8ce996872
commit d704e87ee4
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/setup.c
View File

@@ -1616,7 +1616,6 @@ static int _crypt_format_luks2(struct crypt_device *cd,
/* Wipe integrity superblock and create integrity superblock */
if (crypt_get_integrity_tag_size(cd)) {
/* FIXME: this should be locked. */
r = crypt_wipe_device(cd, crypt_data_device(cd), CRYPT_WIPE_ZERO,
crypt_get_data_offset(cd) * SECTOR_SIZE,
8 * SECTOR_SIZE, 8 * SECTOR_SIZE, NULL, NULL);
@@ -1635,20 +1634,10 @@ static int _crypt_format_luks2(struct crypt_device *cd,
goto out;
}
r = device_write_lock(cd, crypt_data_device(cd));
if (r) {
log_err(cd, _("Failed to acquire write lock on device %s."),
data_device_path(cd));
r = -EINVAL;
goto out;
}
r = INTEGRITY_format(cd, params ? params->integrity_params : NULL, NULL, NULL);
if (r)
log_err(cd, _("Cannot format integrity for device %s."),
data_device_path(cd));
device_write_unlock(crypt_data_device(cd));
}
if (r < 0)