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

On error drop crypt_key from kernel keyring.

Browse Source
This commit is contained in:
Ondrej Kozina
2024-11-06 13:19:26 +01:00
parent dd3441621a
commit 61aaeaff5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -5625,7 +5625,7 @@ static int _activate_by_volume_key(struct crypt_device *cd,
} }
int crypt_activate_by_keyslot_context(struct crypt_device *cd, int crypt_activate_by_keyslot_context(struct crypt_device *cd,
const char *name, const char *name,
int keyslot, int keyslot,
struct crypt_keyslot_context *kc, struct crypt_keyslot_context *kc,
int additional_keyslot, int additional_keyslot,
@@ -5816,7 +5816,7 @@ const char *name,
out: out:
if (r < 0) { if (r < 0) {
crypt_drop_keyring_key(cd, vk); crypt_drop_keyring_key(cd, vk);
crypt_drop_keyring_key(cd, p_crypt); crypt_drop_keyring_key(cd, crypt_key);
if (cd->link_vk_to_keyring && kid1) if (cd->link_vk_to_keyring && kid1)
crypt_unlink_key_from_custom_keyring(cd, kid1); crypt_unlink_key_from_custom_keyring(cd, kid1);
if (cd->link_vk_to_keyring && kid2) if (cd->link_vk_to_keyring && kid2)