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

Remove redundant check for dm-integrity mapping table params section.

Browse Source 
The dm-integrity table always contains number of feature arguments
(since introduction in kernel 4.12).

Moreover, the code already dereferences params field, so the test
make no sense.

Found by CodeQL check.
This commit is contained in:
Milan Broz
2025-01-27 21:39:47 +01:00
parent c9008528f9
commit e257def910
1 changed files with 144 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

291
lib/libdevmapper.c
View File

@@ -2486,165 +2486,162 @@ static int _dm_target_query_integrity(struct crypt_device *cd,
tgt->u.integrity.sector_size = SECTOR_SIZE; tgt->u.integrity.sector_size = SECTOR_SIZE;
/* Features section */ /* Features section, number of arguments (always included) */
if (params) { val64 = strtoull(params, &params, 10);
/* Number of arguments */ if (*params != ' ')
val64 = strtoull(params, &params, 10); goto err;
if (*params != ' ') params++;
goto err;
params++;
features = (int)val64; features = (int)val64;
for (i = 0; i < features; i++) { for (i = 0; i < features; i++) {
r = -EINVAL; r = -EINVAL;
if (!params) if (!params)
goto err;
arg = strsep(&params, " ");
if (sscanf(arg, "journal_sectors:%u", &val) == 1)
tgt->u.integrity.journal_size = val * SECTOR_SIZE;
else if (sscanf(arg, "journal_watermark:%u", &val) == 1)
tgt->u.integrity.journal_watermark = val;
else if (sscanf(arg, "sectors_per_bit:%" PRIu64, &val64) == 1) {
if (val64 > UINT_MAX)
goto err; goto err;
arg = strsep(&params, " "); /* overloaded value for bitmap mode */
if (sscanf(arg, "journal_sectors:%u", &val) == 1) tgt->u.integrity.journal_watermark = (unsigned int)val64;
tgt->u.integrity.journal_size = val * SECTOR_SIZE; } else if (sscanf(arg, "commit_time:%u", &val) == 1)
else if (sscanf(arg, "journal_watermark:%u", &val) == 1) tgt->u.integrity.journal_commit_time = val;
tgt->u.integrity.journal_watermark = val; else if (sscanf(arg, "bitmap_flush_interval:%u", &val) == 1)
else if (sscanf(arg, "sectors_per_bit:%" PRIu64, &val64) == 1) { /* overloaded value for bitmap mode */
if (val64 > UINT_MAX) tgt->u.integrity.journal_commit_time = val;
else if (sscanf(arg, "interleave_sectors:%u", &val) == 1)
tgt->u.integrity.interleave_sectors = val;
else if (sscanf(arg, "block_size:%u", &val) == 1)
tgt->u.integrity.sector_size = val;
else if (sscanf(arg, "buffer_sectors:%u", &val) == 1)
tgt->u.integrity.buffer_sectors = val;
else if (!strncmp(arg, "internal_hash:", 14) && !integrity) {
str = &arg[14];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
integrity = strdup(arg);
if (!integrity) {
r = -ENOMEM;
goto err; goto err;
/* overloaded value for bitmap mode */ }
tgt->u.integrity.journal_watermark = (unsigned int)val64; }
} else if (sscanf(arg, "commit_time:%u", &val) == 1)
tgt->u.integrity.journal_commit_time = val; if (str) {
else if (sscanf(arg, "bitmap_flush_interval:%u", &val) == 1) len = crypt_hex_to_bytes(str, &str2, 1);
/* overloaded value for bitmap mode */ if (len < 0) {
tgt->u.integrity.journal_commit_time = val; r = len;
else if (sscanf(arg, "interleave_sectors:%u", &val) == 1) goto err;
tgt->u.integrity.interleave_sectors = val; }
else if (sscanf(arg, "block_size:%u", &val) == 1)
tgt->u.integrity.sector_size = val; r = 0;
else if (sscanf(arg, "buffer_sectors:%u", &val) == 1) if (get_flags & DM_ACTIVE_CRYPT_KEY) {
tgt->u.integrity.buffer_sectors = val; vk = crypt_alloc_volume_key(len, str2);
else if (!strncmp(arg, "internal_hash:", 14) && !integrity) { if (!vk)
str = &arg[14];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
integrity = strdup(arg);
if (!integrity) {
r = -ENOMEM; r = -ENOMEM;
goto err; } else if (get_flags & DM_ACTIVE_CRYPT_KEYSIZE) {
} vk = crypt_alloc_volume_key(len, NULL);
} if (!vk)
if (str) {
len = crypt_hex_to_bytes(str, &str2, 1);
if (len < 0) {
r = len;
goto err;
}
r = 0;
if (get_flags & DM_ACTIVE_CRYPT_KEY) {
vk = crypt_alloc_volume_key(len, str2);
if (!vk)
r = -ENOMEM;
} else if (get_flags & DM_ACTIVE_CRYPT_KEYSIZE) {
vk = crypt_alloc_volume_key(len, NULL);
if (!vk)
r = -ENOMEM;
}
crypt_safe_free(str2);
if (r < 0)
goto err;
}
} else if (!strncmp(arg, "meta_device:", 12) && !meta_device) {
if (get_flags & DM_ACTIVE_DEVICE) {
str = crypt_lookup_dev(&arg[12]);
r = device_alloc(cd, &meta_device, str);
free(str);
if (r < 0 && r != -ENOTBLK)
goto err;
}
} else if (!strncmp(arg, "journal_crypt:", 14) && !journal_crypt) {
str = &arg[14];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
journal_crypt = strdup(arg);
if (!journal_crypt) {
r = -ENOMEM; r = -ENOMEM;
goto err; }
} crypt_safe_free(str2);
if (r < 0)
goto err;
}
} else if (!strncmp(arg, "meta_device:", 12) && !meta_device) {
if (get_flags & DM_ACTIVE_DEVICE) {
str = crypt_lookup_dev(&arg[12]);
r = device_alloc(cd, &meta_device, str);
free(str);
if (r < 0 && r != -ENOTBLK)
goto err;
}
} else if (!strncmp(arg, "journal_crypt:", 14) && !journal_crypt) {
str = &arg[14];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
journal_crypt = strdup(arg);
if (!journal_crypt) {
r = -ENOMEM;
goto err;
}
}
if (str) {
len = crypt_hex_to_bytes(str, &str2, 1);
if (len < 0) {
r = len;
goto err;
} }
if (str) { r = 0;
len = crypt_hex_to_bytes(str, &str2, 1); if (get_flags & DM_ACTIVE_JOURNAL_CRYPT_KEY) {
if (len < 0) { journal_crypt_key = crypt_alloc_volume_key(len, str2);
r = len; if (!journal_crypt_key)
goto err;
}
r = 0;
if (get_flags & DM_ACTIVE_JOURNAL_CRYPT_KEY) {
journal_crypt_key = crypt_alloc_volume_key(len, str2);
if (!journal_crypt_key)
r = -ENOMEM;
} else if (get_flags & DM_ACTIVE_JOURNAL_CRYPT_KEYSIZE) {
journal_crypt_key = crypt_alloc_volume_key(len, NULL);
if (!journal_crypt_key)
r = -ENOMEM;
}
crypt_safe_free(str2);
if (r < 0)
goto err;
}
} else if (!strncmp(arg, "journal_mac:", 12) && !journal_integrity) {
str = &arg[12];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
journal_integrity = strdup(arg);
if (!journal_integrity) {
r = -ENOMEM; r = -ENOMEM;
goto err; } else if (get_flags & DM_ACTIVE_JOURNAL_CRYPT_KEYSIZE) {
} journal_crypt_key = crypt_alloc_volume_key(len, NULL);
if (!journal_crypt_key)
r = -ENOMEM;
}
crypt_safe_free(str2);
if (r < 0)
goto err;
}
} else if (!strncmp(arg, "journal_mac:", 12) && !journal_integrity) {
str = &arg[12];
arg = strsep(&str, ":");
if (get_flags & DM_ACTIVE_INTEGRITY_PARAMS) {
journal_integrity = strdup(arg);
if (!journal_integrity) {
r = -ENOMEM;
goto err;
}
}
if (str) {
len = crypt_hex_to_bytes(str, &str2, 1);
if (len < 0) {
r = len;
goto err;
} }
if (str) { r = 0;
len = crypt_hex_to_bytes(str, &str2, 1); if (get_flags & DM_ACTIVE_JOURNAL_MAC_KEY) {
if (len < 0) { journal_integrity_key = crypt_alloc_volume_key(len, str2);
r = len; if (!journal_integrity_key)
goto err; r = -ENOMEM;
} } else if (get_flags & DM_ACTIVE_JOURNAL_MAC_KEYSIZE) {
journal_integrity_key = crypt_alloc_volume_key(len, NULL);
r = 0; if (!journal_integrity_key)
if (get_flags & DM_ACTIVE_JOURNAL_MAC_KEY) { r = -ENOMEM;
journal_integrity_key = crypt_alloc_volume_key(len, str2);
if (!journal_integrity_key)
r = -ENOMEM;
} else if (get_flags & DM_ACTIVE_JOURNAL_MAC_KEYSIZE) {
journal_integrity_key = crypt_alloc_volume_key(len, NULL);
if (!journal_integrity_key)
r = -ENOMEM;
}
crypt_safe_free(str2);
if (r < 0)
goto err;
} }
} else if (!strcmp(arg, "recalculate")) { crypt_safe_free(str2);
*act_flags |= CRYPT_ACTIVATE_RECALCULATE; if (r < 0)
} else if (!strcmp(arg, "reset_recalculate")) { goto err;
*act_flags |= CRYPT_ACTIVATE_RECALCULATE_RESET; }
} else if (!strcmp(arg, "fix_padding")) { } else if (!strcmp(arg, "recalculate")) {
tgt->u.integrity.fix_padding = true; *act_flags |= CRYPT_ACTIVATE_RECALCULATE;
} else if (!strcmp(arg, "fix_hmac")) { } else if (!strcmp(arg, "reset_recalculate")) {
tgt->u.integrity.fix_hmac = true; *act_flags |= CRYPT_ACTIVATE_RECALCULATE_RESET;
} else if (!strcmp(arg, "legacy_recalculate")) { } else if (!strcmp(arg, "fix_padding")) {
tgt->u.integrity.legacy_recalc = true; tgt->u.integrity.fix_padding = true;
} else if (!strcmp(arg, "allow_discards")) { } else if (!strcmp(arg, "fix_hmac")) {
*act_flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS; tgt->u.integrity.fix_hmac = true;
} else /* unknown option */ } else if (!strcmp(arg, "legacy_recalculate")) {
goto err; tgt->u.integrity.legacy_recalc = true;
} } else if (!strcmp(arg, "allow_discards")) {
*act_flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
/* All parameters should be processed */ } else /* unknown option */
if (params && *params) {
r = -EINVAL;
goto err; goto err;
} }
/* All parameters should be processed */
if (params && *params) {
r = -EINVAL;
goto err;
} }
if (data_device) if (data_device)