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

harden checks of json_object_array_length return values

Browse Source 
with json-c until 0.12.x json_object_array_length returned signed
integer. json-c 0.13.x and later changed return type to unsigned
size_t.

Consider return values less or equal to zero as empty array, otherwise
array is non-empty.
This commit is contained in:
Ondrej Kozina
2017-12-13 11:20:24 +01:00
committed by Milan Broz
parent d799c8bd1e
commit a12e374a04
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/luks2/luks2_digest.c
View File

@@ -368,14 +368,14 @@ static int digest_unused(json_object *jobj_digest)
json_object *jobj; json_object *jobj;
json_object_object_get_ex(jobj_digest, "segments", &jobj); json_object_object_get_ex(jobj_digest, "segments", &jobj);
if (!jobj || !json_object_is_type(jobj, json_type_array) || json_object_array_length(jobj)) if (!jobj || !json_object_is_type(jobj, json_type_array) || json_object_array_length(jobj) > 0)
return 0; return 0;
json_object_object_get_ex(jobj_digest, "keyslots", &jobj); json_object_object_get_ex(jobj_digest, "keyslots", &jobj);
if (!jobj || !json_object_is_type(jobj, json_type_array)) if (!jobj || !json_object_is_type(jobj, json_type_array))
return 0; return 0;
return json_object_array_length(jobj) ? 0 : 1; return json_object_array_length(jobj) > 0 ? 0 : 1;
} }
void LUKS2_digests_erase_unused(struct crypt_device *cd, void LUKS2_digests_erase_unused(struct crypt_device *cd,

10
lib/luks2/luks2_json_metadata.c
View File

@@ -1288,7 +1288,7 @@ int LUKS2_config_get_requirements(struct crypt_device *cd, struct luks2_hdr *hdr
return 0; return 0;
len = json_object_array_length(jobj_mandatory); len = json_object_array_length(jobj_mandatory);
if (!len) if (len <= 0)
return 0; return 0;
log_dbg("LUKS2 requirements detected:"); log_dbg("LUKS2 requirements detected:");
@@ -1347,7 +1347,7 @@ int LUKS2_config_set_requirements(struct crypt_device *cd, struct luks2_hdr *hdr
json_object_object_add(jobj_config, "requirements", jobj_requirements); json_object_object_add(jobj_config, "requirements", jobj_requirements);
} }
if (json_object_array_length(jobj_mandatory)) { if (json_object_array_length(jobj_mandatory) > 0) {
/* replace mandatory field with new values */ /* replace mandatory field with new values */
json_object_object_add(jobj_requirements, "mandatory", jobj_mandatory); json_object_object_add(jobj_requirements, "mandatory", jobj_mandatory);
} else { } else {
@@ -1390,9 +1390,9 @@ static void hdr_dump_config(struct crypt_device *cd, json_object *hdr_jobj)
log_std(cd, "%s ", json_object_get_string(jobj1)); log_std(cd, "%s ", json_object_get_string(jobj1));
} }
log_std(cd, "%s\n%s", flags ? "" : "(no flags)", reqs ? "" : "\n"); log_std(cd, "%s\n%s", flags > 0 ? "" : "(no flags)", reqs > 0 ? "" : "\n");
if (reqs) { if (reqs > 0) {
log_std(cd, "Requirements:\t"); log_std(cd, "Requirements:\t");
for (i = 0; i < reqs; i++) { for (i = 0; i < reqs; i++) {
jobj1 = json_object_array_get_idx(jobj_mandatory, i); jobj1 = json_object_array_get_idx(jobj_mandatory, i);
@@ -1706,7 +1706,7 @@ int LUKS2_get_volume_key_size(struct luks2_hdr *hdr, int segment)
if (!LUKS2_array_jobj(jobj_digest_segments, buf)) if (!LUKS2_array_jobj(jobj_digest_segments, buf))
continue; continue;
if (!json_object_array_length(jobj_digest_keyslots)) if (json_object_array_length(jobj_digest_keyslots) <= 0)
continue; continue;
jobj1 = json_object_array_get_idx(jobj_digest_keyslots, 0); jobj1 = json_object_array_get_idx(jobj_digest_keyslots, 0);