Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sat, 9 Jan 2021 09:07:16 -0800
From:   Eric Biggers <ebiggers@kernel.org>
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>
Cc:     kjlu@umn.edu, Mimi Zohar <zohar@linux.ibm.com>,
        James Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        Dmitry Kasatkin <dmitry.kasatkin@nokia.com>,
        linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] evm: Fix memleak in init_desc
Message-ID: <X/nixOkNqQdWUAv8@sol.localdomain>
References: <20210109113305.11035-1-dinghao.liu@zju.edu.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210109113305.11035-1-dinghao.liu@zju.edu.cn>
Precedence: bulk

On Sat, Jan 09, 2021 at 07:33:05PM +0800, Dinghao Liu wrote:
> When kmalloc() fails, tmp_tfm allocated by
> crypto_alloc_shash() has not been freed, which
> leads to memleak.
> 
> Fixes: d46eb3699502b ("evm: crypto hash replaced by shash")
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>  security/integrity/evm/evm_crypto.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
> index 168c3b78ac47..39fb31a638ac 100644
> --- a/security/integrity/evm/evm_crypto.c
> +++ b/security/integrity/evm/evm_crypto.c
> @@ -73,7 +73,7 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo)
>  {
>  	long rc;
>  	const char *algo;
> -	struct crypto_shash **tfm, *tmp_tfm;
> +	struct crypto_shash **tfm, *tmp_tfm = NULL;
>  	struct shash_desc *desc;
>  
>  	if (type == EVM_XATTR_HMAC) {
> @@ -118,13 +118,18 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo)
>  alloc:
>  	desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(*tfm),
>  			GFP_KERNEL);
> -	if (!desc)
> +	if (!desc) {
> +		if (tmp_tfm)
> +			crypto_free_shash(tmp_tfm);
>  		return ERR_PTR(-ENOMEM);
> +	}
>  
>  	desc->tfm = *tfm;
>  
>  	rc = crypto_shash_init(desc);
>  	if (rc) {
> +		if (tmp_tfm)
> +			crypto_free_shash(tmp_tfm);
>  		kfree(desc);
>  		return ERR_PTR(rc);
>  	}

There's no need to check for NULL before calling crypto_free_shash().

- Eric