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 unlikely occurences of json_object leaks on error path.

Browse Source 
In most cases it relates to error path triggering on general OOM.
This commit is contained in:
Ondrej Kozina
2023-01-23 15:04:24 +01:00
parent cb177c5076
commit 9a96e260aa
5 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/luks2/luks2_json_format.c
View File

@@ -358,7 +358,10 @@ int LUKS2_generate_hdr(
json_object_object_add(jobj_segment, "integrity", jobj_integrity);
}
json_object_object_add_by_uint(jobj_segments, 0, jobj_segment);
if (json_object_object_add_by_uint(jobj_segments, 0, jobj_segment)) {
json_object_put(jobj_segment);
goto err;
}
json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN));
json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size));

10
lib/luks2/luks2_keyslot.c
View File

@@ -825,7 +825,10 @@ int placeholder_keyslot_alloc(struct crypt_device *cd,
json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length));
json_object_object_add(jobj_keyslot, "area", jobj_area);
json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
if (json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot)) {
json_object_put(jobj_keyslot);
return -EINVAL;
}
return 0;
}
@@ -972,14 +975,17 @@ int LUKS2_keyslot_swap(struct crypt_device *cd, struct luks2_hdr *hdr,
json_object_object_del_by_uint(jobj_keyslots, keyslot);
r = json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot2);
if (r < 0) {
json_object_put(jobj_keyslot2);
log_dbg(cd, "Failed to swap keyslot %d.", keyslot);
return r;
}
json_object_object_del_by_uint(jobj_keyslots, keyslot2);
r = json_object_object_add_by_uint(jobj_keyslots, keyslot2, jobj_keyslot);
if (r < 0)
if (r < 0) {
json_object_put(jobj_keyslot);
log_dbg(cd, "Failed to swap keyslot2 %d.", keyslot2);
}
return r;
}

6
lib/luks2/luks2_keyslot_luks2.c
View File

@@ -553,7 +553,11 @@ static int luks2_keyslot_alloc(struct crypt_device *cd,
json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length));
json_object_object_add(jobj_keyslot, "area", jobj_area);
json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
r = json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
if (r) {
json_object_put(jobj_keyslot);
return r;
}
r = luks2_keyslot_update_json(cd, jobj_keyslot, params);

7
lib/luks2/luks2_keyslot_reenc.c
View File

@@ -145,7 +145,12 @@ static int reenc_keyslot_alloc(struct crypt_device *cd,
else
json_object_object_add(jobj_keyslot, "direction", json_object_new_string("backward"));
json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
r = json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot);
if (r) {
json_object_put(jobj_keyslot);
return r;
}
if (LUKS2_check_json_size(cd, hdr)) {
log_dbg(cd, "New keyslot too large to fit in free metadata space.");
json_object_object_del_by_uint(jobj_keyslots, keyslot);

14
lib/luks2/luks2_luks1_convert.c
View File

@@ -166,7 +166,12 @@ static int json_luks1_keyslots(const struct luks_phdr *hdr_v1, struct json_objec
json_object_put(keyslot_obj);
return r;
}
json_object_object_add_by_uint(keyslot_obj, keyslot, field);
r = json_object_object_add_by_uint(keyslot_obj, keyslot, field);
if (r) {
json_object_put(field);
json_object_put(keyslot_obj);
return r;
}
}
*keyslots_object = keyslot_obj;
@@ -261,7 +266,12 @@ static int json_luks1_segments(const struct luks_phdr *hdr_v1, struct json_objec
json_object_put(segments_obj);
return r;
}
json_object_object_add_by_uint(segments_obj, 0, field);
r = json_object_object_add_by_uint(segments_obj, 0, field);
if (r) {
json_object_put(field);
json_object_put(segments_obj);
return r;
}
*segments_object = segments_obj;
return 0;