From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
To: Hongbo Li <herbert.tencent@gmail.com>,
keyrings@vger.kernel.org, linux-crypto@vger.kernel.org,
herbert@gondor.apana.org.au, dhowells@redhat.com,
jarkko@kernel.org, herberthbli@tencent.com,
stable@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/7] crypto: fix a memory leak in sm2
Date: Fri, 14 May 2021 12:52:29 +0800 [thread overview]
Message-ID: <246ad441-76c9-0934-d132-42d263d63195@linux.alibaba.com> (raw)
In-Reply-To: <1620828254-25545-2-git-send-email-herbert.tencent@gmail.com>
Hi Hongbo,
On 5/12/21 10:04 PM, Hongbo Li wrote:
> From: Hongbo Li <herberthbli@tencent.com>
>
> SM2 module alloc ec->Q in sm2_set_pub_key(), when doing alg test in
> test_akcipher_one(), it will set public key for every test vector,
> and don't free ec->Q. This will cause a memory leak.
>
> This patch alloc ec->Q in sm2_ec_ctx_init().
>
> Signed-off-by: Hongbo Li <herberthbli@tencent.com>
> ---
> crypto/sm2.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/crypto/sm2.c b/crypto/sm2.c
> index b21addc..db8a4a2 100644
> --- a/crypto/sm2.c
> +++ b/crypto/sm2.c
> @@ -79,10 +79,17 @@ static int sm2_ec_ctx_init(struct mpi_ec_ctx *ec)
> goto free;
>
> rc = -ENOMEM;
> +
> + ec->Q = mpi_point_new(0);
> + if (!ec->Q)
> + goto free;
> +
> /* mpi_ec_setup_elliptic_curve */
> ec->G = mpi_point_new(0);
> - if (!ec->G)
> + if (!ec->G) {
> + mpi_point_release(ec->Q);
> goto free;
> + }
>
> mpi_set(ec->G->x, x);
> mpi_set(ec->G->y, y);
> @@ -91,6 +98,7 @@ static int sm2_ec_ctx_init(struct mpi_ec_ctx *ec)
> rc = -EINVAL;
> ec->n = mpi_scanval(ecp->n);
> if (!ec->n) {
> + mpi_point_release(ec->Q);
> mpi_point_release(ec->G);
> goto free;
> }
> @@ -386,27 +394,15 @@ static int sm2_set_pub_key(struct crypto_akcipher *tfm,
> MPI a;
> int rc;
>
> - ec->Q = mpi_point_new(0);
> - if (!ec->Q)
> - return -ENOMEM;
> -
> /* include the uncompressed flag '0x04' */
> - rc = -ENOMEM;
> a = mpi_read_raw_data(key, keylen);
> if (!a)
> - goto error;
> + return -ENOMEM;
>
> mpi_normalize(a);
> rc = sm2_ecc_os2ec(ec->Q, a);
> mpi_free(a);
> - if (rc)
> - goto error;
> -
> - return 0;
>
> -error:
> - mpi_point_release(ec->Q);
> - ec->Q = NULL;
> return rc;
> }
>
>
Thanks a lot for fixing this issue.
Reviewed-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Also added:
Cc: stable@vger.kernel.org # v5.10+
Best regards,
Tianjia
next prev parent reply other threads:[~2021-05-14 4:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 14:04 [PATCH 0/7] crypto: add eddsa support for x509 Hongbo Li
2021-05-12 14:04 ` [PATCH 1/7] crypto: fix a memory leak in sm2 Hongbo Li
2021-05-14 4:52 ` Tianjia Zhang [this message]
2021-05-18 11:40 ` hongbo li
2021-05-12 14:04 ` [PATCH 2/7] lib/mpi: use kcalloc in mpi_resize Hongbo Li
2021-05-12 19:07 ` Eric Biggers
[not found] ` <c12435701edb4f419b71bfa23be780db@tencent.com>
2021-05-17 21:29 ` [PATCH 2/7] lib/mpi: use kcalloc in mpi_resize(Internet mail) Eric Biggers
2021-05-18 13:53 ` hongbo li
2021-05-12 14:04 ` [PATCH 3/7] lib/mpi: export some common function Hongbo Li
2021-05-12 14:04 ` [PATCH 4/7] x509: add support for eddsa Hongbo Li
2021-05-12 14:04 ` [PATCH 5/7] crypto: move common code in sm2 to ec_mpi.c and ec_mpi.h Hongbo Li
2021-05-12 14:04 ` [PATCH 6/7] crypto: ed25519 cert verification Hongbo Li
2021-05-12 18:39 ` kernel test robot
2021-05-12 14:04 ` [PATCH 7/7] crypto: add eddsa test vector Hongbo Li
2021-05-12 19:11 ` [PATCH 0/7] crypto: add eddsa support for x509 Eric Biggers
[not found] ` <dade7666956c41718ce00e681156533e@tencent.com>
2021-05-17 21:21 ` [PATCH 0/7] crypto: add eddsa support for x509(Internet mail) Eric Biggers
2021-05-18 13:57 ` hongbo li
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=246ad441-76c9-0934-d132-42d263d63195@linux.alibaba.com \
--to=tianjia.zhang@linux.alibaba.com \
--cc=dhowells@redhat.com \
--cc=herbert.tencent@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=herberthbli@tencent.com \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).