From 7eba57b4c034eb5d4aa942724d44656e33903943 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 24 Apr 2016 12:38:19 +0200 Subject: [PATCH] Avoid possible divide-by-zero warnings. --- lib/tcrypt/tcrypt.c | 3 +++ src/utils_tools.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/tcrypt/tcrypt.c b/lib/tcrypt/tcrypt.c index fa9b594a..8675ff12 100644 --- a/lib/tcrypt/tcrypt.c +++ b/lib/tcrypt/tcrypt.c @@ -723,6 +723,9 @@ int TCRYPT_activate(struct crypt_device *cd, if (!algs) return -EINVAL; + if (hdr->d.sector_size == 0) + return -EINVAL; + if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) dmd.size = 0; else if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER) diff --git a/src/utils_tools.c b/src/utils_tools.c index 1bb92462..acd9708c 100644 --- a/src/utils_tools.c +++ b/src/utils_tools.c @@ -317,7 +317,7 @@ int tools_string_to_size(struct crypt_device *cd, const char *s, uint64_t *size) } tmp = *size * mult; - if ((tmp / *size) != mult) { + if (*size && (tmp / *size) != mult) { log_dbg("Device size overflow."); return -EINVAL; }