mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: xiujianfeng <xiujianfeng@huawei.com>
To: <zohar@linux.ibm.com>, <dmitry.kasatkin@gmail.com>,
	<jmorris@namei.org>, <serge@hallyn.com>
Cc: <linux-integrity@vger.kernel.org>,
	<linux-security-module@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next] Revert "evm: Fix memleak in init_desc"
Date: Fri, 10 Jun 2022 11:13:39 +0800	[thread overview]
Message-ID: <c34789ad-0a3e-c534-8a74-28c3068602a1@huawei.com> (raw)
In-Reply-To: <20220527111726.195825-1-xiujianfeng@huawei.com>

Hi, ping....

在 2022/5/27 19:17, Xiu Jianfeng 写道:
> This reverts commit ccf11dbaa07b328fa469415c362d33459c140a37.
>
> Commit ccf11dbaa07b ("evm: Fix memleak in init_desc") said there is
> memleak in init_desc. That may be incorrect, as we can see, tmp_tfm is
> saved in one of the two global variables hmac_tfm or evm_tfm[hash_algo],
> then if init_desc is called next time, there is no need to alloc tfm
> again, so in the error path of kmalloc desc or crypto_shash_init(desc),
> It is not a problem without freeing tmp_tfm.
>
> And also that commit did not reset the global variable to NULL after
> freeing tmp_tfm and this makes *tfm a dangling pointer which may cause a
> UAF issue.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
>   security/integrity/evm/evm_crypto.c | 7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
> index a733aff02006..708de9656bbd 100644
> --- a/security/integrity/evm/evm_crypto.c
> +++ b/security/integrity/evm/evm_crypto.c
> @@ -75,7 +75,7 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo)
>   {
>   	long rc;
>   	const char *algo;
> -	struct crypto_shash **tfm, *tmp_tfm = NULL;
> +	struct crypto_shash **tfm, *tmp_tfm;
>   	struct shash_desc *desc;
>   
>   	if (type == EVM_XATTR_HMAC) {
> @@ -120,16 +120,13 @@ 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) {
> -		crypto_free_shash(tmp_tfm);
> +	if (!desc)
>   		return ERR_PTR(-ENOMEM);
> -	}
>   
>   	desc->tfm = *tfm;
>   
>   	rc = crypto_shash_init(desc);
>   	if (rc) {
> -		crypto_free_shash(tmp_tfm);
>   		kfree(desc);
>   		return ERR_PTR(rc);
>   	}

  reply	other threads:[~2022-06-10  3:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-27 11:17 Xiu Jianfeng
2022-06-10  3:13 ` xiujianfeng [this message]
2022-06-10 14:20 ` Mimi Zohar
2022-06-11  2:38   ` Guozihua (Scott)
2022-06-11  3:24   ` xiujianfeng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c34789ad-0a3e-c534-8a74-28c3068602a1@huawei.com \
    --to=xiujianfeng@huawei.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=jmorris@namei.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=serge@hallyn.com \
    --cc=zohar@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®