lib/mpi: Fix karactx leak in mpi_powm
Sometimes mpi_powm will leak karactx because a memory allocation
failure causes a bail-out that skips the freeing of karactx. This
patch moves the freeing of karactx to the end of the function like
everything else so that it can't be skipped.
Reported-by: syzbot+f7baccc38dcc1e094e77@syzkaller.appspotmail.com
Fixes: cdec9cb516
("crypto: GnuPG based MPI lib - source files...")
Cc: <stable@vger.kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Родитель
7829a0c1cb
Коммит
c8ea9fce2b
|
@ -37,6 +37,7 @@
|
||||||
int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
|
int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
|
||||||
{
|
{
|
||||||
mpi_ptr_t mp_marker = NULL, bp_marker = NULL, ep_marker = NULL;
|
mpi_ptr_t mp_marker = NULL, bp_marker = NULL, ep_marker = NULL;
|
||||||
|
struct karatsuba_ctx karactx = {};
|
||||||
mpi_ptr_t xp_marker = NULL;
|
mpi_ptr_t xp_marker = NULL;
|
||||||
mpi_ptr_t tspace = NULL;
|
mpi_ptr_t tspace = NULL;
|
||||||
mpi_ptr_t rp, ep, mp, bp;
|
mpi_ptr_t rp, ep, mp, bp;
|
||||||
|
@ -163,13 +164,11 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
|
||||||
int c;
|
int c;
|
||||||
mpi_limb_t e;
|
mpi_limb_t e;
|
||||||
mpi_limb_t carry_limb;
|
mpi_limb_t carry_limb;
|
||||||
struct karatsuba_ctx karactx;
|
|
||||||
|
|
||||||
xp = xp_marker = mpi_alloc_limb_space(2 * (msize + 1));
|
xp = xp_marker = mpi_alloc_limb_space(2 * (msize + 1));
|
||||||
if (!xp)
|
if (!xp)
|
||||||
goto enomem;
|
goto enomem;
|
||||||
|
|
||||||
memset(&karactx, 0, sizeof karactx);
|
|
||||||
negative_result = (ep[0] & 1) && base->sign;
|
negative_result = (ep[0] & 1) && base->sign;
|
||||||
|
|
||||||
i = esize - 1;
|
i = esize - 1;
|
||||||
|
@ -294,8 +293,6 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
|
||||||
if (mod_shift_cnt)
|
if (mod_shift_cnt)
|
||||||
mpihelp_rshift(rp, rp, rsize, mod_shift_cnt);
|
mpihelp_rshift(rp, rp, rsize, mod_shift_cnt);
|
||||||
MPN_NORMALIZE(rp, rsize);
|
MPN_NORMALIZE(rp, rsize);
|
||||||
|
|
||||||
mpihelp_release_karatsuba_ctx(&karactx);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (negative_result && rsize) {
|
if (negative_result && rsize) {
|
||||||
|
@ -312,6 +309,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
|
||||||
leave:
|
leave:
|
||||||
rc = 0;
|
rc = 0;
|
||||||
enomem:
|
enomem:
|
||||||
|
mpihelp_release_karatsuba_ctx(&karactx);
|
||||||
if (assign_rp)
|
if (assign_rp)
|
||||||
mpi_assign_limb_space(res, rp, size);
|
mpi_assign_limb_space(res, rp, size);
|
||||||
if (mp_marker)
|
if (mp_marker)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче