]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvme-auth: uninitialized variable in nvme_auth_transform_key()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 18 Jul 2022 11:10:45 +0000 (14:10 +0300)
committerJens Axboe <axboe@kernel.dk>
Tue, 2 Aug 2022 23:22:48 +0000 (17:22 -0600)
A couple of the early error gotos call kfree_sensitive(transformed_key);
before "transformed_key" has been initialized.

Fixes: ae0f7c067e31 ("nvmet: implement basic In-Band Authentication")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/nvme/common/auth.c

index 4b146cec9406571c67abafb741210626fdc887cc..df20445918db2a8f025fe1e3d49bbccb04fe4167 100644 (file)
@@ -272,26 +272,33 @@ u8 *nvme_auth_transform_key(struct nvme_dhchap_key *key, char *nqn)
        shash->tfm = key_tfm;
        ret = crypto_shash_setkey(key_tfm, key->key, key->len);
        if (ret < 0)
-               goto out_free_shash;
+               goto out_free_transformed_key;
        ret = crypto_shash_init(shash);
        if (ret < 0)
-               goto out_free_shash;
+               goto out_free_transformed_key;
        ret = crypto_shash_update(shash, nqn, strlen(nqn));
        if (ret < 0)
-               goto out_free_shash;
+               goto out_free_transformed_key;
        ret = crypto_shash_update(shash, "NVMe-over-Fabrics", 17);
        if (ret < 0)
-               goto out_free_shash;
+               goto out_free_transformed_key;
        ret = crypto_shash_final(shash, transformed_key);
+       if (ret < 0)
+               goto out_free_transformed_key;
+
+       kfree(shash);
+       crypto_free_shash(key_tfm);
+
+       return transformed_key;
+
+out_free_transformed_key:
+       kfree_sensitive(transformed_key);
 out_free_shash:
        kfree(shash);
 out_free_key:
        crypto_free_shash(key_tfm);
-       if (ret < 0) {
-               kfree_sensitive(transformed_key);
-               return ERR_PTR(ret);
-       }
-       return transformed_key;
+
+       return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(nvme_auth_transform_key);