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

Do not wipe device with no integrity profile.

Browse Source 
With '--integrity none' we performed useless full
device wipe.

Fixes: #539.
This commit is contained in:
Ondrej Kozina
2020-02-27 16:22:34 +01:00
parent 05d45c6948
commit 91c012eff0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cryptsetup.c
View File

@@ -1196,6 +1196,11 @@ static int _wipe_data_device(struct crypt_device *cd)
return r; return r;
} }
static int strcmp_or_null(const char *str, const char *expected)
{
return !str ? 0 : strcmp(str, expected);
}
static int _luksFormat(struct crypt_device **r_cd, char **r_password, size_t *r_passwordLen) static int _luksFormat(struct crypt_device **r_cd, char **r_password, size_t *r_passwordLen)
{ {
int r = -EINVAL, keysize, integrity_keysize = 0, fd, created = 0; int r = -EINVAL, keysize, integrity_keysize = 0, fd, created = 0;
@@ -1387,7 +1392,8 @@ static int _luksFormat(struct crypt_device **r_cd, char **r_password, size_t *r_
} }
tools_keyslot_msg(r, CREATED); tools_keyslot_msg(r, CREATED);
if (opt_integrity && !opt_integrity_no_wipe) if (opt_integrity && !opt_integrity_no_wipe &&
strcmp_or_null(params2.integrity, "none"))
r = _wipe_data_device(cd); r = _wipe_data_device(cd);
out: out:
if (r >= 0 && r_cd && r_password && r_passwordLen) { if (r >= 0 && r_cd && r_password && r_passwordLen) {
@@ -3405,11 +3411,6 @@ static int run_action(struct action_type *action)
return translate_errno(r); return translate_errno(r);
} }
static int strcmp_or_null(const char *str, const char *expected)
{
return !str ? 0 : strcmp(str, expected);
}
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
static char *popt_tmp; static char *popt_tmp;