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

Fix mem leaks on error path in reenc_keyslot_alloc.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-05-05 11:39:01 +02:00
committed by Milan Broz
parent e00eecf9ca
commit 1cdb7da2ad
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/luks2/luks2_keyslot_reenc.c
View File

@@ -42,6 +42,9 @@ int reenc_keyslot_alloc(struct crypt_device *cd,
log_dbg(cd, "Allocating reencrypt keyslot %d.", keyslot); log_dbg(cd, "Allocating reencrypt keyslot %d.", keyslot);
if (!params || params->direction > CRYPT_REENCRYPT_BACKWARD)
return -EINVAL;
if (keyslot < 0 || keyslot >= LUKS2_KEYSLOTS_MAX) if (keyslot < 0 || keyslot >= LUKS2_KEYSLOTS_MAX)
return -ENOMEM; return -ENOMEM;
@@ -64,6 +67,11 @@ int reenc_keyslot_alloc(struct crypt_device *cd,
return -ENOMEM; return -ENOMEM;
jobj_area = json_object_new_object(); jobj_area = json_object_new_object();
if (!jobj_area) {
json_object_put(jobj_keyslot);
return -ENOMEM;
}
json_object_object_add(jobj_keyslot, "area", jobj_area);
if (params->data_shift) { if (params->data_shift) {
json_object_object_add(jobj_area, "type", json_object_new_string("datashift")); json_object_object_add(jobj_area, "type", json_object_new_string("datashift"));
@@ -80,12 +88,8 @@ int reenc_keyslot_alloc(struct crypt_device *cd,
json_object_object_add(jobj_keyslot, "mode", json_object_new_string(crypt_reencrypt_mode_to_str(params->mode))); json_object_object_add(jobj_keyslot, "mode", json_object_new_string(crypt_reencrypt_mode_to_str(params->mode)));
if (params->direction == CRYPT_REENCRYPT_FORWARD) if (params->direction == CRYPT_REENCRYPT_FORWARD)
json_object_object_add(jobj_keyslot, "direction", json_object_new_string("forward")); json_object_object_add(jobj_keyslot, "direction", json_object_new_string("forward"));
else if (params->direction == CRYPT_REENCRYPT_BACKWARD)
json_object_object_add(jobj_keyslot, "direction", json_object_new_string("backward"));
else else
return -EINVAL; json_object_object_add(jobj_keyslot, "direction", json_object_new_string("backward"));
json_object_object_add(jobj_keyslot, "area", jobj_area);
json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
if (LUKS2_check_json_size(cd, hdr)) { if (LUKS2_check_json_size(cd, hdr)) {