]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firmware_loader: Fix possible resource leak in fw_log_firmware_info()
authorGaosheng Cui <cuigaosheng1@huawei.com>
Wed, 16 Oct 2024 11:03:35 +0000 (19:03 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:54:04 +0000 (13:54 +0100)
[ Upstream commit 369a9c046c2fdfe037f05b43b84c386bdbccc103 ]

The alg instance should be released under the exception path, otherwise
there may be resource leak here.

To mitigate this, free the alg instance with crypto_free_shash when kmalloc
fails.

Fixes: 02fe26f25325 ("firmware_loader: Add debug message with checksum for FW file")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Russ Weight <russ.weight@linux.dev>
Link: https://lore.kernel.org/r/20241016110335.3677924-1-cuigaosheng1@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/base/firmware_loader/main.c

index 324a9a3c087aa2e2c4e0b53b30a2f11f61195aa3..c6664a7879697944eec1fa8d54e39492be53875a 100644 (file)
@@ -829,19 +829,18 @@ static void fw_log_firmware_info(const struct firmware *fw, const char *name, st
        shash->tfm = alg;
 
        if (crypto_shash_digest(shash, fw->data, fw->size, sha256buf) < 0)
-               goto out_shash;
+               goto out_free;
 
        for (int i = 0; i < SHA256_DIGEST_SIZE; i++)
                sprintf(&outbuf[i * 2], "%02x", sha256buf[i]);
        outbuf[SHA256_BLOCK_SIZE] = 0;
        dev_dbg(device, "Loaded FW: %s, sha256: %s\n", name, outbuf);
 
-out_shash:
-       crypto_free_shash(alg);
 out_free:
        kfree(shash);
        kfree(outbuf);
        kfree(sha256buf);
+       crypto_free_shash(alg);
 }
 #else
 static void fw_log_firmware_info(const struct firmware *fw, const char *name,