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

Do not try to remove device that was not succesfully activated.

Browse Source
This commit is contained in:
Milan Broz
2019-04-16 15:37:36 +02:00
committed by Ondrej Kozina
parent 86b2736480
commit 91ba22b157
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/luks1/keyencryption.c
View File

@@ -60,7 +60,7 @@ static int LUKS_endec_template(char *src, size_t srcLength,
struct crypt_dm_active_device dmd = { struct crypt_dm_active_device dmd = {
.flags = CRYPT_ACTIVATE_PRIVATE, .flags = CRYPT_ACTIVATE_PRIVATE,
}; };
int r, devfd = -1; int r, devfd = -1, remove_dev = 0;
size_t bsize, keyslot_alignment, alignment; size_t bsize, keyslot_alignment, alignment;
log_dbg(ctx, "Using dmcrypt to access keyslot area."); log_dbg(ctx, "Using dmcrypt to access keyslot area.");
@@ -114,6 +114,7 @@ static int LUKS_endec_template(char *src, size_t srcLength,
r = -EIO; r = -EIO;
goto out; goto out;
} }
remove_dev = 1;
devfd = open(path, mode | O_DIRECT | O_SYNC); devfd = open(path, mode | O_DIRECT | O_SYNC);
if (devfd == -1) { if (devfd == -1) {
@@ -132,7 +133,8 @@ static int LUKS_endec_template(char *src, size_t srcLength,
dm_targets_free(ctx, &dmd); dm_targets_free(ctx, &dmd);
if (devfd != -1) if (devfd != -1)
close(devfd); close(devfd);
dm_remove_device(ctx, name, CRYPT_DEACTIVATE_FORCE); if (remove_dev)
dm_remove_device(ctx, name, CRYPT_DEACTIVATE_FORCE);
return r; return r;
} }