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

Check for algorithms string lengths in crypt_cipher_check().

Browse Source 
The kernel check will fail anyway if string is truncated, but this
make some compilers more happy.
This commit is contained in:
Milan Broz
2018-11-25 10:55:28 +01:00
parent 43088ee8ba
commit 2f6d0c006c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/crypto_backend/crypto_cipher_kernel.c
View File

@@ -203,7 +203,8 @@ int crypt_cipher_check(const char *name, const char *mode,
const char *integrity, size_t key_length) const char *integrity, size_t key_length)
{ {
struct crypt_cipher *c = NULL; struct crypt_cipher *c = NULL;
char mode_name[64], *real_mode = NULL, *cipher_iv = NULL, *key, *salg_type; char mode_name[64], tmp_salg_name[180], *real_mode = NULL, *cipher_iv = NULL, *key;
const char *salg_type;
bool aead; bool aead;
int r; int r;
struct sockaddr_alg sa = { struct sockaddr_alg sa = {
@@ -225,16 +226,22 @@ int crypt_cipher_check(const char *name, const char *mode,
salg_type = aead ? "aead" : "skcipher"; salg_type = aead ? "aead" : "skcipher";
snprintf((char *)sa.salg_type, sizeof(sa.salg_type), "%s", salg_type); snprintf((char *)sa.salg_type, sizeof(sa.salg_type), "%s", salg_type);
memset(tmp_salg_name, 0, sizeof(tmp_salg_name));
/* FIXME: this is duplicating a part of devmapper backend */ /* FIXME: this is duplicating a part of devmapper backend */
if (aead && !strcmp(integrity, "poly1305")) if (aead && !strcmp(integrity, "poly1305"))
snprintf((char *)sa.salg_name, sizeof(sa.salg_name), "rfc7539(%s,%s)", name, integrity); r = snprintf(tmp_salg_name, sizeof(tmp_salg_name), "rfc7539(%s,%s)", name, integrity);
else if (!real_mode) else if (!real_mode)
snprintf((char *)sa.salg_name, sizeof(sa.salg_name), "%s", name); r = snprintf(tmp_salg_name, sizeof(tmp_salg_name), "%s", name);
else if (aead && !strcmp(real_mode, "ccm")) else if (aead && !strcmp(real_mode, "ccm"))
snprintf((char *)sa.salg_name, sizeof(sa.salg_name), "rfc4309(%s(%s))", real_mode, name); r = snprintf(tmp_salg_name, sizeof(tmp_salg_name), "rfc4309(%s(%s))", real_mode, name);
else else
snprintf((char *)sa.salg_name, sizeof(sa.salg_name), "%s(%s)", real_mode, name); r = snprintf(tmp_salg_name, sizeof(tmp_salg_name), "%s(%s)", real_mode, name);
if (r <= 0 || r > (sizeof(sa.salg_name) - 1))
return -EINVAL;
memcpy(sa.salg_name, tmp_salg_name, sizeof(sa.salg_name));
key = malloc(key_length); key = malloc(key_length);
if (!key) if (!key)