* [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error
@ 2017-11-22 8:08 Corentin Labbe
2017-11-22 8:55 ` Ard Biesheuvel
0 siblings, 1 reply; 4+ messages in thread
From: Corentin Labbe @ 2017-11-22 8:08 UTC (permalink / raw)
To: herbert, davem, catalin.marinas, will.deacon
Cc: linux-crypto, linux-arm-kernel, linux-kernel, Corentin Labbe
When a cipher fail to register in aes_init(), the error path go thought
aes_exit() then crypto_unregister_skciphers().
Since aes_exit calls also crypto_unregister_skcipher, this trigger a
refcount_t: underflow; use-after-free.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
arch/arm64/crypto/aes-glue.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 998ba519a026..9e42ec96243e 100644
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -664,7 +664,10 @@ static int __init aes_init(void)
return 0;
unregister_simds:
- aes_exit();
+ for (i = 0; i < ARRAY_SIZE(aes_simd_algs); i++)
+ if (aes_simd_algs[i])
+ simd_skcipher_free(aes_simd_algs[i]);
+ crypto_unregister_shashes(mac_algs, ARRAY_SIZE(mac_algs));
unregister_ciphers:
crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
return err;
--
2.13.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error
2017-11-22 8:08 [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error Corentin Labbe
@ 2017-11-22 8:55 ` Ard Biesheuvel
2017-11-24 4:55 ` Herbert Xu
2017-11-24 5:52 ` LABBE Corentin
0 siblings, 2 replies; 4+ messages in thread
From: Ard Biesheuvel @ 2017-11-22 8:55 UTC (permalink / raw)
To: Corentin Labbe
Cc: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
linux-crypto, linux-arm-kernel, linux-kernel
Hello Corentin,
On 22 November 2017 at 08:08, Corentin Labbe <clabbe@baylibre.com> wrote:
> When a cipher fail
fails
> to register in aes_init(), the error path go thought
goes through
> aes_exit() then crypto_unregister_skciphers().
> Since aes_exit calls also crypto_unregister_skcipher, this trigger a
triggers
> refcount_t: underflow; use-after-free.
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> arch/arm64/crypto/aes-glue.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
> index 998ba519a026..9e42ec96243e 100644
> --- a/arch/arm64/crypto/aes-glue.c
> +++ b/arch/arm64/crypto/aes-glue.c
> @@ -664,7 +664,10 @@ static int __init aes_init(void)
> return 0;
>
> unregister_simds:
> - aes_exit();
> + for (i = 0; i < ARRAY_SIZE(aes_simd_algs); i++)
> + if (aes_simd_algs[i])
> + simd_skcipher_free(aes_simd_algs[i]);
> + crypto_unregister_shashes(mac_algs, ARRAY_SIZE(mac_algs));
> unregister_ciphers:
> crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
> return err;
> --
> 2.13.6
>
>
Would this also fix it?
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 998ba519a026..2fa850e86aa8 100644
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -665,6 +665,7 @@ static int __init aes_init(void)
unregister_simds:
aes_exit();
+ return err;
unregister_ciphers:
crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
return err;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error
2017-11-22 8:55 ` Ard Biesheuvel
@ 2017-11-24 4:55 ` Herbert Xu
2017-11-24 5:52 ` LABBE Corentin
1 sibling, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2017-11-24 4:55 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Corentin Labbe, David S. Miller, Catalin Marinas, Will Deacon,
linux-crypto, linux-arm-kernel, linux-kernel
On Wed, Nov 22, 2017 at 08:55:14AM +0000, Ard Biesheuvel wrote:
>
> Would this also fix it?
Looks good. Could you resubmit with a sign-off?
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error
2017-11-22 8:55 ` Ard Biesheuvel
2017-11-24 4:55 ` Herbert Xu
@ 2017-11-24 5:52 ` LABBE Corentin
1 sibling, 0 replies; 4+ messages in thread
From: LABBE Corentin @ 2017-11-24 5:52 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
linux-crypto, linux-arm-kernel, linux-kernel
On Wed, Nov 22, 2017 at 08:55:14AM +0000, Ard Biesheuvel wrote:
> Hello Corentin,
>
> On 22 November 2017 at 08:08, Corentin Labbe <clabbe@baylibre.com> wrote:
> > When a cipher fail
>
> fails
>
> > to register in aes_init(), the error path go thought
>
> goes through
>
> > aes_exit() then crypto_unregister_skciphers().
> > Since aes_exit calls also crypto_unregister_skcipher, this trigger a
>
> triggers
>
> > refcount_t: underflow; use-after-free.
> >
> > Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> > ---
> > arch/arm64/crypto/aes-glue.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
> > index 998ba519a026..9e42ec96243e 100644
> > --- a/arch/arm64/crypto/aes-glue.c
> > +++ b/arch/arm64/crypto/aes-glue.c
> > @@ -664,7 +664,10 @@ static int __init aes_init(void)
> > return 0;
> >
> > unregister_simds:
> > - aes_exit();
> > + for (i = 0; i < ARRAY_SIZE(aes_simd_algs); i++)
> > + if (aes_simd_algs[i])
> > + simd_skcipher_free(aes_simd_algs[i]);
> > + crypto_unregister_shashes(mac_algs, ARRAY_SIZE(mac_algs));
> > unregister_ciphers:
> > crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
> > return err;
> > --
> > 2.13.6
> >
> >
>
>
> Would this also fix it?
>
> diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
> index 998ba519a026..2fa850e86aa8 100644
> --- a/arch/arm64/crypto/aes-glue.c
> +++ b/arch/arm64/crypto/aes-glue.c
> @@ -665,6 +665,7 @@ static int __init aes_init(void)
>
> unregister_simds:
> aes_exit();
> + return err;
> unregister_ciphers:
> crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
> return err;
Yes it is better.
I will send a v2 today.
Regards
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-24 5:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-22 8:08 [PATCH] crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error Corentin Labbe
2017-11-22 8:55 ` Ard Biesheuvel
2017-11-24 4:55 ` Herbert Xu
2017-11-24 5:52 ` LABBE Corentin
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).