Avoid possible divide-by-zero warnings.

This commit is contained in:
Milan Broz
2016-04-24 12:38:19 +02:00
parent b282cb2366
commit f92786a044
2 changed files with 4 additions and 1 deletions

View File

@@ -724,6 +724,9 @@ int TCRYPT_activate(struct crypt_device *cd,
if (!algs) if (!algs)
return -EINVAL; return -EINVAL;
if (hdr->d.sector_size == 0)
return -EINVAL;
if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER)
dmd.size = 0; dmd.size = 0;
else if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER) else if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER)

View File

@@ -319,7 +319,7 @@ int tools_string_to_size(struct crypt_device *cd, const char *s, uint64_t *size)
} }
tmp = *size * mult; tmp = *size * mult;
if ((tmp / *size) != mult) { if (*size && (tmp / *size) != mult) {
log_dbg("Device size overflow."); log_dbg("Device size overflow.");
return -EINVAL; return -EINVAL;
} }