Always zero memory in crypt_safe_alloc.

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 6288b34..f711392 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -1125,7 +1125,6 @@ int dm_resume_and_reinstate_key(struct crypt_device *cd, const char *name,
                goto out;
        }
 
-       memset(msg, 0, msg_size);
        strcpy(msg, "key set ");
        hex_key(&msg[8], key_size, key);
 

diff --git a/lib/utils_crypt.c b/lib/utils_crypt.c
index 4433dc7..204932f 100644 (file)
--- a/lib/utils_crypt.c
+++ b/lib/utils_crypt.c
@@ -92,6 +92,7 @@ void *crypt_safe_alloc(size_t size)
                return NULL;
 
        alloc->size = size;
+       memset(&alloc->data, 0, size);
 
        return &alloc->data;
 }