dm-inlinecrypt: Fix an error handling path in inlinecrypt_ctr()

All error handling paths, except but this one, branch to the 'bad' label in
the error handling path.

If not done, there is a memory leak and some sensitive data may be kept
around.

So, fix this error path and also do the needed clean-up.

Also, fix missing goto in the "Wrong alignment of iv_offset sector" path.

Fixes: e7f57d2c47e2 ("dm-inlinecrypt: add target for inline block device encryption")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/dm-inlinecrypt.c b/drivers/md/dm-inlinecrypt.c
index be1b4aa8f28bcf1682b20bcd3a8c5cb9e0815bc9..41293c18d10f2b96fa3219b10800366dd44edb2f 100644 (file)
--- a/drivers/md/dm-inlinecrypt.c
+++ b/drivers/md/dm-inlinecrypt.c
@@ -347,7 +347,8 @@ static int inlinecrypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        err = get_key_size(&argv[1]);
        if (err < 0) {
                ti->error = "Cannot parse key size";
-               return -EINVAL;
+               err = -EINVAL;
+               goto bad;
        }
        ctx->key_size = err;
 
@@ -398,6 +399,7 @@ static int inlinecrypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (ctx->iv_offset & ((ctx->sector_size >> SECTOR_SHIFT) - 1)) {
                ti->error = "Wrong alignment of iv_offset sector";
                err = -EINVAL;
+               goto bad;
        }
 
        ctx->max_dun = (ctx->iv_offset + ti->len - 1) >>